Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDE Pim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Unmaintained
KDE Pim
Commits
990918e3
Commit
990918e3
authored
Jun 24, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use QStringLiteral
parent
8737eaac
Changes
99
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
99 changed files
with
510 additions
and
510 deletions
+510
-510
akonadiconsole/tagpropertiesdialog.cpp
akonadiconsole/tagpropertiesdialog.cpp
+2
-2
akregator/src/feed.cpp
akregator/src/feed.cpp
+17
-17
akregator/src/feedlist.cpp
akregator/src/feedlist.cpp
+1
-1
calendarsupport/kcalmodel.cpp
calendarsupport/kcalmodel.cpp
+1
-1
calendarviews/todo/incidencetreemodel.cpp
calendarviews/todo/incidencetreemodel.cpp
+1
-1
composereditor-ng/image/composerimagedialog.cpp
composereditor-ng/image/composerimagedialog.cpp
+9
-9
composereditor-ng/private/composerview_p.cpp
composereditor-ng/private/composerview_p.cpp
+7
-7
composereditor-ng/table/composertableactionmenu.cpp
composereditor-ng/table/composertableactionmenu.cpp
+4
-4
composereditor-ng/table/composertablecellformatdialog.cpp
composereditor-ng/table/composertablecellformatdialog.cpp
+10
-10
composereditor-ng/table/composertableformatdialog.cpp
composereditor-ng/table/composertableformatdialog.cpp
+4
-4
console/konsolekalendar/konsolekalendar.cpp
console/konsolekalendar/konsolekalendar.cpp
+1
-1
kalarm/functions.cpp
kalarm/functions.cpp
+1
-1
kalarm/kamail.cpp
kalarm/kamail.cpp
+1
-1
kalarm/lib/shellprocess.cpp
kalarm/lib/shellprocess.cpp
+1
-1
kalarm/mainwindow.cpp
kalarm/mainwindow.cpp
+30
-30
kalarm/resourceselector.cpp
kalarm/resourceselector.cpp
+11
-11
kalarm/rtcwakeaction.cpp
kalarm/rtcwakeaction.cpp
+1
-1
kleopatra/commands/changeroottrustcommand.cpp
kleopatra/commands/changeroottrustcommand.cpp
+1
-1
kleopatra/commands/clearcrlcachecommand.cpp
kleopatra/commands/clearcrlcachecommand.cpp
+1
-1
kleopatra/commands/dumpcrlcachecommand.cpp
kleopatra/commands/dumpcrlcachecommand.cpp
+1
-1
kleopatra/commands/exportopenpgpcertstoservercommand.cpp
kleopatra/commands/exportopenpgpcertstoservercommand.cpp
+2
-2
kleopatra/commands/exportsecretkeycommand.cpp
kleopatra/commands/exportsecretkeycommand.cpp
+6
-6
kleopatra/commands/importcrlcommand.cpp
kleopatra/commands/importcrlcommand.cpp
+1
-1
kleopatra/commands/refreshopenpgpcertscommand.cpp
kleopatra/commands/refreshopenpgpcertscommand.cpp
+2
-2
kleopatra/commands/refreshx509certscommand.cpp
kleopatra/commands/refreshx509certscommand.cpp
+1
-1
kleopatra/dialogs/adduseriddialog.cpp
kleopatra/dialogs/adduseriddialog.cpp
+1
-1
kleopatra/kgpgconf/configreader.cpp
kleopatra/kgpgconf/configreader.cpp
+1
-1
kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp
kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp
+2
-2
kleopatra/libkleopatraclient/core/command.cpp
kleopatra/libkleopatraclient/core/command.cpp
+1
-1
kleopatra/mainwindow_desktop.cpp
kleopatra/mainwindow_desktop.cpp
+2
-2
kleopatra/newcertificatewizard/newcertificatewizard.cpp
kleopatra/newcertificatewizard/newcertificatewizard.cpp
+7
-7
kleopatra/selftest/gpgconfcheck.cpp
kleopatra/selftest/gpgconfcheck.cpp
+3
-3
kleopatra/utils/gnupg-helper.cpp
kleopatra/utils/gnupg-helper.cpp
+10
-10
kmail/collectionpage/collectionmailinglistpage.cpp
kmail/collectionpage/collectionmailinglistpage.cpp
+1
-1
kmail/configuredialog/configureaccountpage.cpp
kmail/configuredialog/configureaccountpage.cpp
+2
-2
kmail/editor/kmcomposewin.cpp
kmail/editor/kmcomposewin.cpp
+51
-51
kmail/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
...phishingemail/autotests/potentialphishingemailjobtest.cpp
+12
-12
kmail/kmmainwidget.cpp
kmail/kmmainwidget.cpp
+56
-56
kmail/kmreadermainwin.cpp
kmail/kmreadermainwin.cpp
+3
-3
kmail/kmreaderwin.cpp
kmail/kmreaderwin.cpp
+12
-12
knotes/apps/knotesapp.cpp
knotes/apps/knotesapp.cpp
+7
-7
knotes/kontactplugin/knotes_part.cpp
knotes/kontactplugin/knotes_part.cpp
+16
-16
kontact/plugins/summary/summaryview_part.cpp
kontact/plugins/summary/summaryview_part.cpp
+5
-5
kontact/plugins/summary/summaryview_plugin.cpp
kontact/plugins/summary/summaryview_plugin.cpp
+1
-1
kontact/src/mainwindow.cpp
kontact/src/mainwindow.cpp
+6
-6
korgac/koalarmclient.cpp
korgac/koalarmclient.cpp
+3
-3
korganizer/actionmanager.cpp
korganizer/actionmanager.cpp
+48
-48
korganizer/kcmdesignerfields.cpp
korganizer/kcmdesignerfields.cpp
+1
-1
korganizer/kontactplugin/korganizer/todosummarywidget.cpp
korganizer/kontactplugin/korganizer/todosummarywidget.cpp
+1
-1
korganizer/kontactplugin/specialdates/sdsummarywidget.cpp
korganizer/kontactplugin/specialdates/sdsummarywidget.cpp
+1
-1
korganizer/prefs/koprefsdialog.cpp
korganizer/prefs/koprefsdialog.cpp
+2
-2
ktnef/ktnefmain.cpp
ktnef/ktnefmain.cpp
+10
-10
ktnef/main.cpp
ktnef/main.cpp
+2
-2
libkdepim/ldap/ldapclient.cpp
libkdepim/ldap/ldapclient.cpp
+1
-1
libkleo/backends/chiasmus/chiasmusbackend.cpp
libkleo/backends/chiasmus/chiasmusbackend.cpp
+2
-2
libkleo/backends/chiasmus/obtainkeysjob.cpp
libkleo/backends/chiasmus/obtainkeysjob.cpp
+1
-1
libkleo/backends/chiasmus/symcryptrunprocessbase.cpp
libkleo/backends/chiasmus/symcryptrunprocessbase.cpp
+6
-6
libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp
libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp
+2
-2
libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+2
-2
libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+3
-3
libkleo/ui/keyselectiondialog.cpp
libkleo/ui/keyselectiondialog.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
...eui/autocreatescripts/sieveactions/sieveactionconvert.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
...autocreatescripts/sieveactions/sieveactionextracttext.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
...ui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
+3
-3
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
...ieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
+2
-2
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
...veui/autocreatescripts/sieveactions/sieveactionnotify.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
...ui/autocreatescripts/sieveactions/sieveactionredirect.cpp
+2
-2
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
...autocreatescripts/sieveactions/sieveactionsetvariable.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
...ui/autocreatescripts/sieveactions/sieveactionvacation.cpp
+2
-2
libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
...tocreatescripts/sieveconditions/sieveconditionconvert.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
...tocreatescripts/sieveconditions/sieveconditionhasflag.cpp
+3
-3
libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
...escripts/sieveconditions/sieveconditionservermetadata.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
...ocreatescripts/sieveconditions/sieveconditionspamtest.cpp
+2
-2
libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
...createscripts/sieveconditions/sieveconditionvirustest.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
.../ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
+1
-1
libksieve/ksieveui/autocreatescripts/sieveincludewidget.cpp
libksieve/ksieveui/autocreatescripts/sieveincludewidget.cpp
+1
-1
mailcommon/filter/filteractions/filteractionsetstatus.cpp
mailcommon/filter/filteractions/filteractionsetstatus.cpp
+1
-1
mailcommon/filter/filteractions/filteractionunsetstatus.cpp
mailcommon/filter/filteractions/filteractionunsetstatus.cpp
+1
-1
mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
...ommon/filter/filterimporter/filterimporterthunderbird.cpp
+1
-1
mailcommon/search/searchrule/searchrule.cpp
mailcommon/search/searchrule/searchrule.cpp
+13
-13
mailcommon/snippets/snippetsmodel.cpp
mailcommon/snippets/snippetsmodel.cpp
+2
-2
mailimporter/filter_plain.cpp
mailimporter/filter_plain.cpp
+1
-1
mailimporter/filter_pmail.cpp
mailimporter/filter_pmail.cpp
+1
-1
messagecomposer/attachment/attachmentcontrollerbase.cpp
messagecomposer/attachment/attachmentcontrollerbase.cpp
+12
-12
messagecomposer/autotests/messagefactorytest.cpp
messagecomposer/autotests/messagefactorytest.cpp
+1
-1
messagecore/utils/stringutil.cpp
messagecore/utils/stringutil.cpp
+5
-5
messagelist/pane.cpp
messagelist/pane.cpp
+8
-8
messageviewer/adblock/tests/adblockblockableitemdialog_gui.cpp
...geviewer/adblock/tests/adblockblockableitemdialog_gui.cpp
+1
-1
messageviewer/autotests/rendertest.cpp
messageviewer/autotests/rendertest.cpp
+5
-5
messageviewer/htmlwriter/webkitparthtmlwriter.cpp
messageviewer/htmlwriter/webkitparthtmlwriter.cpp
+1
-1
messageviewer/scamdetection/tests/scamdetection_gui.cpp
messageviewer/scamdetection/tests/scamdetection_gui.cpp
+1
-1
messageviewer/viewer/mailwebview_webkit.cpp
messageviewer/viewer/mailwebview_webkit.cpp
+3
-3
messageviewer/viewer/nodehelper.cpp
messageviewer/viewer/nodehelper.cpp
+2
-2
messageviewer/viewer/urlhandlermanager.cpp
messageviewer/viewer/urlhandlermanager.cpp
+1
-1
pimcommon/baloodebug/baloosyntaxhighlighter.cpp
pimcommon/baloodebug/baloosyntaxhighlighter.cpp
+4
-4
pimsettingexporter/core/mail/exportmailjob.cpp
pimsettingexporter/core/mail/exportmailjob.cpp
+1
-1
pimsettingexporter/core/mail/importmailjob.cpp
pimsettingexporter/core/mail/importmailjob.cpp
+14
-14
pimsettingexporter/core/tests/showarchivestructuredialog_gui.cpp
...ingexporter/core/tests/showarchivestructuredialog_gui.cpp
+1
-1
pimsettingexporter/gui/pimsettingexporterwindow.cpp
pimsettingexporter/gui/pimsettingexporterwindow.cpp
+5
-5
No files found.
akonadiconsole/tagpropertiesdialog.cpp
View file @
990918e3
...
...
@@ -286,7 +286,7 @@ void TagPropertiesDialog::slotAccept()
"WHERE "
);
QStringList
conds
;
for
(
int
i
=
0
;
i
<
mRemovedRIDs
.
count
();
++
i
)
{
conds
<<
Q
Latin1String
(
"name = ?"
);
conds
<<
Q
StringLiteral
(
"name = ?"
);
}
queryStr
+=
conds
.
join
(
QLatin1String
(
" OR "
))
+
QLatin1String
(
")"
);
query
.
prepare
(
queryStr
);
...
...
@@ -308,7 +308,7 @@ void TagPropertiesDialog::slotAccept()
QString
queryStr
=
QLatin1String
(
"SELECT id, name FROM ResourceTable WHERE "
);
QStringList
conds
;
for
(
int
i
=
0
;
i
<
mChangedRIDs
.
count
();
++
i
)
{
conds
<<
Q
Latin1String
(
"name = ?"
);
conds
<<
Q
StringLiteral
(
"name = ?"
);
}
queryStr
+=
conds
.
join
(
QLatin1String
(
" OR "
));
query
.
prepare
(
queryStr
);
...
...
akregator/src/feed.cpp
View file @
990918e3
...
...
@@ -468,29 +468,29 @@ bool Akregator::Feed::isArticlesLoaded() const
QDomElement
Akregator
::
Feed
::
toOPML
(
QDomElement
parent
,
QDomDocument
document
)
const
{
QDomElement
el
=
document
.
createElement
(
QLatin1String
(
"outline"
));
el
.
setAttribute
(
Q
Latin1String
(
"text"
),
title
());
el
.
setAttribute
(
Q
Latin1String
(
"title"
),
title
());
el
.
setAttribute
(
Q
Latin1String
(
"xmlUrl"
),
d
->
xmlUrl
);
el
.
setAttribute
(
Q
Latin1String
(
"htmlUrl"
),
d
->
htmlUrl
);
el
.
setAttribute
(
Q
Latin1String
(
"id"
),
QString
::
number
(
id
()));
el
.
setAttribute
(
Q
Latin1String
(
"description"
),
d
->
description
);
el
.
setAttribute
(
Q
Latin1String
(
"useCustomFetchInterval"
),
(
useCustomFetchInterval
()
?
QLatin1String
(
"true"
)
:
QLatin1String
(
"false"
)));
el
.
setAttribute
(
Q
Latin1String
(
"fetchInterval"
),
QString
::
number
(
fetchInterval
()));
el
.
setAttribute
(
Q
Latin1String
(
"archiveMode"
),
archiveModeToString
(
d
->
archiveMode
));
el
.
setAttribute
(
Q
Latin1String
(
"maxArticleAge"
),
d
->
maxArticleAge
);
el
.
setAttribute
(
Q
Latin1String
(
"maxArticleNumber"
),
d
->
maxArticleNumber
);
el
.
setAttribute
(
Q
StringLiteral
(
"text"
),
title
());
el
.
setAttribute
(
Q
StringLiteral
(
"title"
),
title
());
el
.
setAttribute
(
Q
StringLiteral
(
"xmlUrl"
),
d
->
xmlUrl
);
el
.
setAttribute
(
Q
StringLiteral
(
"htmlUrl"
),
d
->
htmlUrl
);
el
.
setAttribute
(
Q
StringLiteral
(
"id"
),
QString
::
number
(
id
()));
el
.
setAttribute
(
Q
StringLiteral
(
"description"
),
d
->
description
);
el
.
setAttribute
(
Q
StringLiteral
(
"useCustomFetchInterval"
),
(
useCustomFetchInterval
()
?
QLatin1String
(
"true"
)
:
QLatin1String
(
"false"
)));
el
.
setAttribute
(
Q
StringLiteral
(
"fetchInterval"
),
QString
::
number
(
fetchInterval
()));
el
.
setAttribute
(
Q
StringLiteral
(
"archiveMode"
),
archiveModeToString
(
d
->
archiveMode
));
el
.
setAttribute
(
Q
StringLiteral
(
"maxArticleAge"
),
d
->
maxArticleAge
);
el
.
setAttribute
(
Q
StringLiteral
(
"maxArticleNumber"
),
d
->
maxArticleNumber
);
if
(
d
->
markImmediatelyAsRead
)
{
el
.
setAttribute
(
Q
Latin1String
(
"markImmediatelyAsRead"
),
QLatin1String
(
"true"
));
el
.
setAttribute
(
Q
StringLiteral
(
"markImmediatelyAsRead"
),
QLatin1String
(
"true"
));
}
if
(
d
->
useNotification
)
{
el
.
setAttribute
(
Q
Latin1String
(
"useNotification"
),
QLatin1String
(
"true"
));
el
.
setAttribute
(
Q
StringLiteral
(
"useNotification"
),
QLatin1String
(
"true"
));
}
if
(
d
->
loadLinkedWebsite
)
{
el
.
setAttribute
(
Q
Latin1String
(
"loadLinkedWebsite"
),
QLatin1String
(
"true"
));
el
.
setAttribute
(
Q
StringLiteral
(
"loadLinkedWebsite"
),
QLatin1String
(
"true"
));
}
el
.
setAttribute
(
Q
Latin1String
(
"maxArticleNumber"
),
d
->
maxArticleNumber
);
el
.
setAttribute
(
Q
Latin1String
(
"type"
),
QLatin1String
(
"rss"
));
// despite some additional fields, it is still "rss" OPML
el
.
setAttribute
(
Q
Latin1String
(
"version"
),
QLatin1String
(
"RSS"
));
el
.
setAttribute
(
Q
StringLiteral
(
"maxArticleNumber"
),
d
->
maxArticleNumber
);
el
.
setAttribute
(
Q
StringLiteral
(
"type"
),
QLatin1String
(
"rss"
));
// despite some additional fields, it is still "rss" OPML
el
.
setAttribute
(
Q
StringLiteral
(
"version"
),
QLatin1String
(
"RSS"
));
parent
.
appendChild
(
el
);
return
el
;
}
...
...
akregator/src/feedlist.cpp
View file @
990918e3
...
...
@@ -362,7 +362,7 @@ QDomDocument FeedList::toOpml() const
doc
.
appendChild
(
doc
.
createProcessingInstruction
(
QLatin1String
(
"xml"
),
QLatin1String
(
"version=
\"
1.0
\"
encoding=
\"
UTF-8
\"
"
)));
QDomElement
root
=
doc
.
createElement
(
QLatin1String
(
"opml"
));
root
.
setAttribute
(
Q
Latin1String
(
"version"
),
QLatin1String
(
"1.0"
));
root
.
setAttribute
(
Q
StringLiteral
(
"version"
),
QLatin1String
(
"1.0"
));
doc
.
appendChild
(
root
);
QDomElement
head
=
doc
.
createElement
(
QLatin1String
(
"head"
));
...
...
calendarsupport/kcalmodel.cpp
View file @
990918e3
...
...
@@ -89,7 +89,7 @@ QStringList KCalModel::mimeTypes() const
{
return
QStringList
()
<<
Q
Latin1String
(
"text/uri-list"
)
<<
Q
StringLiteral
(
"text/uri-list"
)
<<
d
->
allMimeTypes
();
}
...
...
calendarviews/todo/incidencetreemodel.cpp
View file @
990918e3
...
...
@@ -883,7 +883,7 @@ QDebug operator<<(QDebug s, const Node::Ptr &node)
static
int
level
=
0
;
++
level
;
QString
padding
=
QString
(
level
-
1
,
QLatin1Char
(
' '
));
s
<<
padding
+
QLatin1String
(
"node"
)
<<
node
.
data
()
<<
Q
Latin1String
(
";uid="
)
<<
node
->
uid
<<
QLatin1String
(
";id="
)
<<
node
->
id
<<
QLatin1String
(
";parentUid="
)
<<
node
->
parentUid
<<
QLatin1String
(
";parentNode="
)
<<
(
void
*
)(
node
->
parentNode
.
data
())
<<
'\n'
;
s
<<
padding
+
QLatin1String
(
"node"
)
<<
node
.
data
()
<<
Q
StringLiteral
(
";uid="
)
<<
node
->
uid
<<
QStringLiteral
(
";id="
)
<<
node
->
id
<<
QStringLiteral
(
";parentUid="
)
<<
node
->
parentUid
<<
QStringLiteral
(
";parentNode="
)
<<
(
void
*
)(
node
->
parentNode
.
data
())
<<
'\n'
;
foreach
(
const
Node
::
Ptr
&
child
,
node
->
directChilds
)
{
s
<<
child
;
...
...
composereditor-ng/image/composerimagedialog.cpp
View file @
990918e3
...
...
@@ -101,32 +101,32 @@ void ComposerImageDialogPrivate::updateImageHtml()
imageHeight
=
imageWidget
->
imageHeight
();
}
if
(
imageWidth
==
-
1
)
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"width"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"width"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"width"
),
QString
::
number
(
imageWidth
));
webElement
.
setAttribute
(
Q
StringLiteral
(
"width"
),
QString
::
number
(
imageWidth
));
}
if
(
imageHeight
==
-
1
)
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"height"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"height"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"height"
),
QString
::
number
(
imageHeight
));
webElement
.
setAttribute
(
Q
StringLiteral
(
"height"
),
QString
::
number
(
imageHeight
));
}
QString
str
(
title
->
text
());
if
(
str
.
isEmpty
())
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"title"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"title"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"title"
),
str
);
webElement
.
setAttribute
(
Q
StringLiteral
(
"title"
),
str
);
}
str
=
alternateTitle
->
text
();
if
(
str
.
isEmpty
())
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"alt"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"alt"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"alt"
),
str
);
webElement
.
setAttribute
(
Q
StringLiteral
(
"alt"
),
str
);
}
webElement
.
setAttribute
(
Q
Latin1String
(
"src"
),
imageWidget
->
imageUrl
().
url
());
webElement
.
setAttribute
(
Q
StringLiteral
(
"src"
),
imageWidget
->
imageUrl
().
url
());
}
void
ComposerImageDialogPrivate
::
initialize
()
...
...
composereditor-ng/private/composerview_p.cpp
View file @
990918e3
...
...
@@ -264,13 +264,13 @@ void ComposerViewPrivate::createAction(ComposerView::ComposerViewAction type)
action_font_size
=
new
KSelectAction
(
i18nc
(
"@action"
,
"Font &Size"
),
q
);
htmlEditorActionList
.
append
(
action_font_size
);
QStringList
sizes
;
sizes
<<
Q
Latin1String
(
"xx-small"
);
sizes
<<
Q
Latin1String
(
"x-small"
);
sizes
<<
Q
Latin1String
(
"small"
);
sizes
<<
Q
Latin1String
(
"medium"
);
sizes
<<
Q
Latin1String
(
"large"
);
sizes
<<
Q
Latin1String
(
"x-large"
);
sizes
<<
Q
Latin1String
(
"xx-large"
);
sizes
<<
Q
StringLiteral
(
"xx-small"
);
sizes
<<
Q
StringLiteral
(
"x-small"
);
sizes
<<
Q
StringLiteral
(
"small"
);
sizes
<<
Q
StringLiteral
(
"medium"
);
sizes
<<
Q
StringLiteral
(
"large"
);
sizes
<<
Q
StringLiteral
(
"x-large"
);
sizes
<<
Q
StringLiteral
(
"xx-large"
);
action_font_size
->
setItems
(
sizes
);
action_font_size
->
setCurrentItem
(
0
);
q
->
connect
(
action_font_size
,
SIGNAL
(
triggered
(
int
)),
q
,
SLOT
(
_k_setFontSize
(
int
)));
...
...
composereditor-ng/table/composertableactionmenu.cpp
View file @
990918e3
...
...
@@ -98,19 +98,19 @@ public:
void
ComposerTableActionMenuPrivate
::
_k_slotSplitCell
()
{
if
(
webElement
.
hasAttribute
(
QLatin1String
(
"colspan"
)))
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"colspan"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"colspan"
));
}
if
(
webElement
.
hasAttribute
(
QLatin1String
(
"rowspan"
)))
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"rowspan"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"rowspan"
));
}
}
void
ComposerTableActionMenuPrivate
::
_k_slotMergeCellToTheRight
()
{
if
(
webElement
.
hasAttribute
(
QLatin1String
(
"colspan"
)))
{
webElement
.
setAttribute
(
Q
Latin1String
(
"colspan"
),
QString
::
number
(
webElement
.
attribute
(
QLatin1String
(
"colspan"
)).
toInt
()
+
1
));
webElement
.
setAttribute
(
Q
StringLiteral
(
"colspan"
),
QString
::
number
(
webElement
.
attribute
(
QLatin1String
(
"colspan"
)).
toInt
()
+
1
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"colspan"
),
QString
::
number
(
2
));
webElement
.
setAttribute
(
Q
StringLiteral
(
"colspan"
),
QString
::
number
(
2
));
}
}
...
...
composereditor-ng/table/composertablecellformatdialog.cpp
View file @
990918e3
...
...
@@ -195,32 +195,32 @@ void ComposerTableCellFormatDialogPrivate::applyChanges()
if
(
useBackgroundColor
->
isChecked
())
{
const
QColor
col
=
backgroundColor
->
color
();
if
(
col
.
isValid
())
{
webElement
.
setAttribute
(
Q
Latin1String
(
"bgcolor"
),
col
.
name
());
webElement
.
setAttribute
(
Q
StringLiteral
(
"bgcolor"
),
col
.
name
());
}
}
else
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"bgcolor"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"bgcolor"
));
}
if
(
useVerticalAlignment
->
isChecked
())
{
webElement
.
setAttribute
(
Q
Latin1String
(
"valign"
),
verticalAlignment
->
itemData
(
verticalAlignment
->
currentIndex
()).
toString
());
webElement
.
setAttribute
(
Q
StringLiteral
(
"valign"
),
verticalAlignment
->
itemData
(
verticalAlignment
->
currentIndex
()).
toString
());
}
else
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"valign"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"valign"
));
}
if
(
useHorizontalAlignment
->
isChecked
())
{
webElement
.
setAttribute
(
Q
Latin1String
(
"align"
),
horizontalAlignment
->
itemData
(
horizontalAlignment
->
currentIndex
()).
toString
());
webElement
.
setAttribute
(
Q
StringLiteral
(
"align"
),
horizontalAlignment
->
itemData
(
horizontalAlignment
->
currentIndex
()).
toString
());
}
else
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"align"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"align"
));
}
const
QString
widthStr
=
width
->
value
();
if
(
widthStr
.
isEmpty
())
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"width"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"width"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"width"
),
widthStr
);
webElement
.
setAttribute
(
Q
StringLiteral
(
"width"
),
widthStr
);
}
const
QString
heightStr
=
height
->
value
();
if
(
heightStr
.
isEmpty
())
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"height"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"height"
));
}
else
{
webElement
.
setAttribute
(
Q
Latin1String
(
"height"
),
heightStr
);
webElement
.
setAttribute
(
Q
StringLiteral
(
"height"
),
heightStr
);
}
}
}
...
...
composereditor-ng/table/composertableformatdialog.cpp
View file @
990918e3
...
...
@@ -71,16 +71,16 @@ void ComposerTableFormatDialogPrivate::_k_slotWebElementChanged()
void
ComposerTableFormatDialogPrivate
::
applyChanges
()
{
if
(
!
webElement
.
isNull
())
{
webElement
.
setAttribute
(
Q
Latin1String
(
"border"
),
QString
::
number
(
insertTableWidget
->
border
()));
webElement
.
setAttribute
(
Q
StringLiteral
(
"border"
),
QString
::
number
(
insertTableWidget
->
border
()));
const
QString
width
=
QStringLiteral
(
"%1%2"
).
arg
(
insertTableWidget
->
length
()).
arg
(
insertTableWidget
->
typeOfLength
()
==
QTextLength
::
PercentageLength
?
QLatin1String
(
"%"
)
:
QString
());
webElement
.
setAttribute
(
Q
Latin1String
(
"width"
),
width
);
webElement
.
setAttribute
(
Q
StringLiteral
(
"width"
),
width
);
if
(
useBackgroundColor
->
isChecked
())
{
const
QColor
col
=
backgroundColor
->
color
();
if
(
col
.
isValid
())
{
webElement
.
setAttribute
(
Q
Latin1String
(
"bgcolor"
),
backgroundColor
->
color
().
name
());
webElement
.
setAttribute
(
Q
StringLiteral
(
"bgcolor"
),
backgroundColor
->
color
().
name
());
}
}
else
{
webElement
.
removeAttribute
(
Q
Latin1String
(
"bgcolor"
));
webElement
.
removeAttribute
(
Q
StringLiteral
(
"bgcolor"
));
}
//TODO update column/row
}
...
...
console/konsolekalendar/konsolekalendar.cpp
View file @
990918e3
...
...
@@ -82,7 +82,7 @@ bool KonsoleKalendar::printCalendarList()
{
Akonadi
::
CollectionFetchJob
*
job
=
new
Akonadi
::
CollectionFetchJob
(
Akonadi
::
Collection
::
root
(),
Akonadi
::
CollectionFetchJob
::
Recursive
);
QStringList
mimeTypes
=
QStringList
()
<<
Q
Latin1String
(
"text/calendar"
)
QStringList
mimeTypes
=
QStringList
()
<<
Q
StringLiteral
(
"text/calendar"
)
<<
KCalCore
::
Event
::
eventMimeType
()
<<
KCalCore
::
Todo
::
todoMimeType
()
<<
KCalCore
::
Journal
::
journalMimeType
();
...
...
kalarm/functions.cpp
View file @
990918e3
...
...
@@ -1433,7 +1433,7 @@ bool Private::startKMailMinimised()
// We are not using KApplication, so the env remained set.
KStartupInfoId id = KStartupInfo::currentStartupIdEnv();
KProcess* proc = new KProcess;
(*proc) << Q
Latin1String
("kmail");
(*proc) << Q
StringLiteral
("kmail");
int pid = proc->startDetached();
if (!pid)
{
...
...
kalarm/kamail.cpp
View file @
990918e3
...
...
@@ -166,7 +166,7 @@ int KAMail::send(JobData& jobdata, QStringList& errmsgs)
if
(
!
transport
)
{
QStringList
paths
;
paths
<<
Q
Latin1String
(
"/sbin"
)
<<
QLatin1String
(
"/usr/sbin"
)
<<
QLatin1String
(
"/usr/lib"
);
paths
<<
Q
StringLiteral
(
"/sbin"
)
<<
QStringLiteral
(
"/usr/sbin"
)
<<
QStringLiteral
(
"/usr/lib"
);
QString
command
=
QStandardPaths
::
findExecutable
(
QLatin1String
(
"sendmail"
),
paths
);
transport
=
manager
->
createTransport
();
transport
->
setName
(
QLatin1String
(
"sendmail"
));
...
...
kalarm/lib/shellprocess.cpp
View file @
990918e3
...
...
@@ -59,7 +59,7 @@ bool ShellProcess::start(OpenMode openMode)
connect
(
this
,
SIGNAL
(
readyReadStandardOutput
()),
SLOT
(
stdoutReady
()));
connect
(
this
,
SIGNAL
(
readyReadStandardError
()),
SLOT
(
stderrReady
()));
QStringList
args
;
args
<<
Q
Latin1String
(
"-c"
)
<<
mCommand
;
args
<<
Q
StringLiteral
(
"-c"
)
<<
mCommand
;
QProcess
::
start
(
QLatin1String
(
shellName
()),
args
,
openMode
);
if
(
!
waitForStarted
())
{
...
...
kalarm/mainwindow.cpp
View file @
990918e3
...
...
@@ -420,133 +420,133 @@ void MainWindow::initActions()
KActionCollection
*
actions
=
actionCollection
();
mActionTemplates
=
new
QAction
(
i18nc
(
"@action"
,
"&Templates..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"templates"
),
mActionTemplates
);
actions
->
addAction
(
Q
StringLiteral
(
"templates"
),
mActionTemplates
);
connect
(
mActionTemplates
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotTemplates
);
mActionNew
=
new
NewAlarmAction
(
false
,
i18nc
(
"@action"
,
"&New"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"new"
),
mActionNew
);
actions
->
addAction
(
Q
StringLiteral
(
"new"
),
mActionNew
);
QAction
*
action
=
mActionNew
->
displayAlarmAction
();
actions
->
addAction
(
Q
Latin1String
(
"newDisplay"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"newDisplay"
),
action
);
#pragma message("port QT5")
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewDisplay
);
action
=
mActionNew
->
commandAlarmAction
();
actions
->
addAction
(
Q
Latin1String
(
"newCommand"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"newCommand"
),
action
);
#pragma message("port QT5")
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewCommand
);
action
=
mActionNew
->
emailAlarmAction
();
actions
->
addAction
(
Q
Latin1String
(
"newEmail"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"newEmail"
),
action
);
#pragma message("port QT5")
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewEmail
);
action
=
mActionNew
->
audioAlarmAction
();
actions
->
addAction
(
Q
Latin1String
(
"newAudio"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"newAudio"
),
action
);
#pragma message("port QT5")
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewAudio
);
TemplateMenuAction
*
templateMenuAction
=
mActionNew
->
fromTemplateAlarmAction
();
actions
->
addAction
(
Q
Latin1String
(
"newFromTemplate"
),
templateMenuAction
);
actions
->
addAction
(
Q
StringLiteral
(
"newFromTemplate"
),
templateMenuAction
);
connect
(
templateMenuAction
,
&
TemplateMenuAction
::
selected
,
this
,
&
MainWindow
::
slotNewFromTemplate
);
mActionCreateTemplate
=
new
QAction
(
i18nc
(
"@action"
,
"Create Tem&plate..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"createTemplate"
),
mActionCreateTemplate
);
actions
->
addAction
(
Q
StringLiteral
(
"createTemplate"
),
mActionCreateTemplate
);
connect
(
mActionCreateTemplate
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewTemplate
);
mActionCopy
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-copy"
)),
i18nc
(
"@action"
,
"&Copy..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"copy"
),
mActionCopy
);
actions
->
addAction
(
Q
StringLiteral
(
"copy"
),
mActionCopy
);
actions
->
setDefaultShortcut
(
mActionCopy
,
QKeySequence
(
Qt
::
SHIFT
+
Qt
::
Key_Insert
));
connect
(
mActionCopy
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotCopy
);
mActionModify
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-properties"
)),
i18nc
(
"@action"
,
"&Edit..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"modify"
),
mActionModify
);
actions
->
addAction
(
Q
StringLiteral
(
"modify"
),
mActionModify
);
actions
->
setDefaultShortcut
(
mActionModify
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_E
));
connect
(
mActionModify
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotModify
);
mActionDelete
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-delete"
)),
i18nc
(
"@action"
,
"&Delete"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"delete"
),
mActionDelete
);
actions
->
addAction
(
Q
StringLiteral
(
"delete"
),
mActionDelete
);
actions
->
setDefaultShortcut
(
mActionDelete
,
QKeySequence
::
Delete
);
connect
(
mActionDelete
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotDeleteIf
);
// Set up Shift-Delete as a shortcut to delete without confirmation
mActionDeleteForce
=
new
QAction
(
i18nc
(
"@action"
,
"Delete Without Confirmation"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"delete-force"
),
mActionDeleteForce
);
actions
->
addAction
(
Q
StringLiteral
(
"delete-force"
),
mActionDeleteForce
);
actions
->
setDefaultShortcut
(
mActionDeleteForce
,
QKeySequence
::
Delete
+
Qt
::
SHIFT
);
connect
(
mActionDeleteForce
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotDeleteForce
);
mActionReactivate
=
new
QAction
(
i18nc
(
"@action"
,
"Reac&tivate"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"undelete"
),
mActionReactivate
);
actions
->
addAction
(
Q
StringLiteral
(
"undelete"
),
mActionReactivate
);
actions
->
setDefaultShortcut
(
mActionReactivate
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_R
));
connect
(
mActionReactivate
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotReactivate
);
mActionEnable
=
new
QAction
(
this
);
actions
->
addAction
(
Q
Latin1String
(
"disable"
),
mActionEnable
);
actions
->
addAction
(
Q
StringLiteral
(
"disable"
),
mActionEnable
);
actions
->
setDefaultShortcut
(
mActionEnable
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_B
));
connect
(
mActionEnable
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotEnable
);
action
=
new
QAction
(
i18nc
(
"@action"
,
"Wake From Suspend..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"wakeSuspend"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"wakeSuspend"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotWakeFromSuspend
);
action
=
KAlarm
::
createStopPlayAction
(
this
);
actions
->
addAction
(
Q
Latin1String
(
"stopAudio"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"stopAudio"
),
action
);
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
mActionShowTime
=
new
KToggleAction
(
i18n_a_ShowAlarmTimes
(),
this
);
actions
->
addAction
(
Q
Latin1String
(
"showAlarmTimes"
),
mActionShowTime
);
actions
->
addAction
(
Q
StringLiteral
(
"showAlarmTimes"
),
mActionShowTime
);
connect
(
mActionShowTime
,
&
KToggleAction
::
triggered
,
this
,
&
MainWindow
::
slotShowTime
);
mActionShowTimeTo
=
new
KToggleAction
(
i18n_o_ShowTimeToAlarms
(),
this
);
actions
->
addAction
(
Q
Latin1String
(
"showTimeToAlarms"
),
mActionShowTimeTo
);
actions
->
addAction
(
Q
StringLiteral
(
"showTimeToAlarms"
),
mActionShowTimeTo
);
actions
->
setDefaultShortcut
(
mActionShowTimeTo
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_I
));
connect
(
mActionShowTimeTo
,
&
KToggleAction
::
triggered
,
this
,
&
MainWindow
::
slotShowTimeTo
);
mActionShowArchived
=
new
KToggleAction
(
i18nc
(
"@action"
,
"Show Archi&ved Alarms"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"showArchivedAlarms"
),
mActionShowArchived
);
actions
->
addAction
(
Q
StringLiteral
(
"showArchivedAlarms"
),
mActionShowArchived
);
actions
->
setDefaultShortcut
(
mActionShowArchived
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_P
));
connect
(
mActionShowArchived
,
&
KToggleAction
::
triggered
,
this
,
&
MainWindow
::
slotShowArchived
);
mActionToggleTrayIcon
=
new
KToggleAction
(
i18nc
(
"@action"
,
"Show in System &Tray"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"showInSystemTray"
),
mActionToggleTrayIcon
);
actions
->
addAction
(
Q
StringLiteral
(
"showInSystemTray"
),
mActionToggleTrayIcon
);
connect
(
mActionToggleTrayIcon
,
&
KToggleAction
::
triggered
,
this
,
&
MainWindow
::
slotToggleTrayIcon
);
mActionToggleResourceSel
=
new
KToggleAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"view-choose"
)),
i18nc
(
"@action"
,
"Show &Calendars"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"showResources"
),
mActionToggleResourceSel
);
actions
->
addAction
(
Q
StringLiteral
(
"showResources"
),
mActionToggleResourceSel
);
connect
(
mActionToggleResourceSel
,
&
KToggleAction
::
triggered
,
this
,
&
MainWindow
::
slotToggleResourceSelector
);
mActionSpreadWindows
=
KAlarm
::
createSpreadWindowsAction
(
this
);
actions
->
addAction
(
Q
Latin1String
(
"spread"
),
mActionSpreadWindows
);
actions
->
addAction
(
Q
StringLiteral
(
"spread"
),
mActionSpreadWindows
);
#pragma message("port QT5")
//QT5 mActionSpreadWindows->setGlobalShortcut(dummy); // actions->addAction() must be called first!
mActionImportAlarms
=
new
QAction
(
i18nc
(
"@action"
,
"Import &Alarms..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"importAlarms"
),
mActionImportAlarms
);
actions
->
addAction
(
Q
StringLiteral
(
"importAlarms"
),
mActionImportAlarms
);
connect
(
mActionImportAlarms
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotImportAlarms
);
mActionImportBirthdays
=
new
QAction
(
i18nc
(
"@action"
,
"Import &Birthdays..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"importBirthdays"
),
mActionImportBirthdays
);
actions
->
addAction
(
Q
StringLiteral
(
"importBirthdays"
),
mActionImportBirthdays
);
connect
(
mActionImportBirthdays
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotBirthdays
);
mActionExportAlarms
=
new
QAction
(
i18nc
(
"@action"
,
"E&xport Selected Alarms..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"exportAlarms"
),
mActionExportAlarms
);
actions
->
addAction
(
Q
StringLiteral
(
"exportAlarms"
),
mActionExportAlarms
);
connect
(
mActionExportAlarms
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotExportAlarms
);
mActionExport
=
new
QAction
(
i18nc
(
"@action"
,
"E&xport..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"export"
),
mActionExport
);
actions
->
addAction
(
Q
StringLiteral
(
"export"
),
mActionExport
);
connect
(
mActionExport
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotExportAlarms
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"view-refresh"
)),
i18nc
(
"@action"
,
"&Refresh Alarms"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"refreshAlarms"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"refreshAlarms"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotRefreshAlarms
);
KToggleAction
*
toggleAction
=
KAlarm
::
createAlarmEnableAction
(
this
);
actions
->
addAction
(
Q
Latin1String
(
"alarmsEnable"
),
toggleAction
);
actions
->
addAction
(
Q
StringLiteral
(
"alarmsEnable"
),
toggleAction
);
if
(
undoText
.
isNull
())
{
// Get standard texts, etc., for Undo and Redo actions
...
...
@@ -562,12 +562,12 @@ void MainWindow::initActions()
delete
act
;
}
mActionUndo
=
new
KToolBarPopupAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-undo"
)),
undoText
,
this
);
actions
->
addAction
(
Q
Latin1String
(
"edit_undo"
),
mActionUndo
);
actions
->
addAction
(
Q
StringLiteral
(
"edit_undo"
),
mActionUndo
);
mActionUndo
->
setShortcuts
(
undoShortcut
);
connect
(
mActionUndo
,
&
KToolBarPopupAction
::
triggered
,
this
,
&
MainWindow
::
slotUndo
);
mActionRedo
=
new
KToolBarPopupAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-redo"
)),
redoText
,
this
);
actions
->
addAction
(
Q
Latin1String
(
"edit_redo"
),
mActionRedo
);
actions
->
addAction
(
Q
StringLiteral
(
"edit_redo"
),
mActionRedo
);
mActionRedo
->
setShortcuts
(
redoShortcut
);
connect
(
mActionRedo
,
&
KToolBarPopupAction
::
triggered
,
this
,
&
MainWindow
::
slotRedo
);
...
...
kalarm/resourceselector.cpp
View file @
990918e3
...
...
@@ -356,37 +356,37 @@ void ResourceSelector::selectionChanged()
void
ResourceSelector
::
initActions
(
KActionCollection
*
actions
)
{
mActionReload
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"view-refresh"
)),
i18nc
(
"@action Reload calendar"
,
"Re&load"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resReload"
),
mActionReload
);
actions
->
addAction
(
Q
StringLiteral
(
"resReload"
),
mActionReload
);
connect
(
mActionReload
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
reloadResource
);
mActionShowDetails
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"help-about"
)),
i18nc
(
"@action"
,
"Show &Details"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resDetails"
),
mActionShowDetails
);
actions
->
addAction
(
Q
StringLiteral
(
"resDetails"
),
mActionShowDetails
);
connect
(
mActionShowDetails
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
showInfo
);
mActionSetColour
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"color-picker"
)),
i18nc
(
"@action"
,
"Set &Color..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resSetColour"
),
mActionSetColour
);
actions
->
addAction
(
Q
StringLiteral
(
"resSetColour"
),
mActionSetColour
);
connect
(
mActionSetColour
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
setColour
);
mActionClearColour
=
new
QAction
(
i18nc
(
"@action"
,
"Clear C&olor"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resClearColour"
),
mActionClearColour
);
actions
->
addAction
(
Q
StringLiteral
(
"resClearColour"
),
mActionClearColour
);
connect
(
mActionClearColour
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
clearColour
);
mActionEdit
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-properties"
)),
i18nc
(
"@action"
,
"&Edit..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resEdit"
),
mActionEdit
);
actions
->
addAction
(
Q
StringLiteral
(
"resEdit"
),
mActionEdit
);
connect
(
mActionEdit
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
editResource
);
mActionUpdate
=
new
QAction
(
i18nc
(
"@action"
,
"&Update Calendar Format"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resUpdate"
),
mActionUpdate
);
actions
->
addAction
(
Q
StringLiteral
(
"resUpdate"
),
mActionUpdate
);
connect
(
mActionUpdate
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
updateResource
);
mActionRemove
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-delete"
)),
i18nc
(
"@action"
,
"&Remove"
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resRemove"
),
mActionRemove
);
actions
->
addAction
(
Q
StringLiteral
(
"resRemove"
),
mActionRemove
);
connect
(
mActionRemove
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
removeResource
);
mActionSetDefault
=
new
KToggleAction
(
this
);
actions
->
addAction
(
Q
Latin1String
(
"resDefault"
),
mActionSetDefault
);
actions
->
addAction
(
Q
StringLiteral
(
"resDefault"
),
mActionSetDefault
);
connect
(
mActionSetDefault
,
&
KToggleAction
::
triggered
,
this
,
&
ResourceSelector
::
setStandard
);
QAction
*
action
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-new"
)),
i18nc
(
"@action"
,
"&Add..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resAdd"
),
action
);
actions
->
addAction
(
Q
StringLiteral
(
"resAdd"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
addResource
);
mActionImport
=
new
QAction
(
i18nc
(
"@action"
,
"Im&port..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resImport"
),
mActionImport
);
actions
->
addAction
(
Q
StringLiteral
(
"resImport"
),
mActionImport
);
connect
(
mActionImport
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
importCalendar
);
mActionExport
=
new
QAction
(
i18nc
(
"@action"
,
"E&xport..."
),
this
);
actions
->
addAction
(
Q
Latin1String
(
"resExport"
),
mActionExport
);
actions
->
addAction
(
Q
StringLiteral
(
"resExport"
),
mActionExport
);
connect
(
mActionExport
,
&
QAction
::
triggered
,
this
,
&
ResourceSelector
::
exportCalendar
);
}
...
...
kalarm/rtcwakeaction.cpp
View file @
990918e3
...
...
@@ -77,7 +77,7 @@ ActionReply RtcWakeAction::settimer(const QVariantMap& args)
// If 't' is zero, the current wakeup is cancelled by setting a new wakeup
// time 2 seconds from now, which will then expire.
unsigned
now
=
KDateTime
::
currentUtcDateTime
().
toTime_t
();
proc
<<
exe
<<
Q
Latin1String
(
"-m"
)
<<
QLatin1String
(
"no"
)
<<
QLatin1String
(
"-s"
)
<<
QString
::
number
(
t
?
t
-
now
:
2
);
proc
<<
exe
<<
Q
StringLiteral
(
"-m"
)
<<
QStringLiteral
(
"no"
)
<<
QStringLiteral
(
"-s"
)
<<
QString
::
number
(
t
?
t
-
now
:
2
);
result
=
proc
.
execute
(
5000
);
// allow a timeout of 5 seconds