Commit 84aa3c2c authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

QLatin1String() -> QStringLiteral

parent c21a68f6
......@@ -32,14 +32,14 @@ namespace Akregator
{
AboutData::AboutData()
: KAboutData(QLatin1String("akregator"),
: KAboutData(QStringLiteral("akregator"),
i18n("Akregator"),
QLatin1String(KDEPIM_VERSION),
QStringLiteral(KDEPIM_VERSION),
i18n("A KDE Feed Reader"),
KAboutLicense::GPL,
i18n("Copyright © 2004–2015 Akregator authors"),
QString(),
QLatin1String("https://userbase.kde.org/Akregator"))
QStringLiteral("https://userbase.kde.org/Akregator"))
{
setOrganizationDomain("kde.org"); // needed to get org.kde.akregator used for DBUS
addAuthor(i18n("Frank Osterfeld"), i18n("Maintainer"), "osterfeld@kde.org");
......
......@@ -35,22 +35,22 @@ static void akregator_options(QCommandLineParser *parser)
{
QList<QCommandLineOption> options;
options << QCommandLineOption(
QStringList() << QLatin1String("a") << QLatin1String("addfeed"),
QStringList() << QStringLiteral(("a") << QStringLiteral(("addfeed"),
i18n("Add a feed with the given URL"),
QLatin1String("url"))
QStringLiteral(("url"))
<< QCommandLineOption(
QStringList() << QLatin1String("g") << QLatin1String("group"),
QStringList() << QStringLiteral(("g") << QStringLiteral(("group"),
i18n("When adding feeds, place them in this group"),
QLatin1String("groupname")) // "Imported"
QStringLiteral(("groupname")) // "Imported"
<< QCommandLineOption(
QLatin1String("hide-mainwindow"),
QStringLiteral(("hide-mainwindow"),
i18n("Hide main window on startup"));
parser->addOptions(options);
parser->addPositionalArgument(
QLatin1String("url"),
QStringLiteral(("url"),
i18n("Add a feed with the given URL"),
QLatin1String("[url...]"));
QStringLiteral(("[url...]"));
}
}
......
......@@ -765,11 +765,11 @@ bool Part::handleCommandLine(const QStringList &args)
akregator_options(&parser);
parser.process(args);
const QString addFeedGroup = parser.isSet(QLatin1String("group"))
? parser.value(QLatin1String(QLatin1String("group")))
const QString addFeedGroup = parser.isSet(QStringLiteral("group"))
? parser.value(QStringLiteral("group"))
: i18n("Imported Folder");
QStringList feedsToAdd = parser.values(QLatin1String("addfeed"));
QStringList feedsToAdd = parser.values(QStringLiteral("addfeed"));
if (feedsToAdd.isEmpty() && !parser.positionalArguments().isEmpty()) {
for (const QString &url : parser.positionalArguments()) {
......
......@@ -689,7 +689,7 @@ void ArticleViewer::displayAboutPage()
QString infocss = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdeui/about/kde_infopage.css");
QString rtl = (QApplication::layoutDirection() == Qt::RightToLeft)
? QString("@import \"%1\";").arg(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdeui/about/kde_infopage_rtl.css"))
? QString(QStringLiteral("@import \"%1\";")).arg(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdeui/about/kde_infopage_rtl.css"))
: QString();
m_part->write(content.arg(infocss, rtl, fontSize, appTitle, catchPhrase, quickDescription, info));
......
......@@ -63,7 +63,7 @@ int Application::activate(const QStringList &args)
mMainWindow = new Akregator::MainWindow();
mMainWindow->loadPart();
mMainWindow->setupProgressWidgets();
if (!parser->isSet(QLatin1String("hide-mainwindow"))) {
if (!parser->isSet(QStringLiteral("hide-mainwindow"))) {
mMainWindow->show();
}
akr.call(QStringLiteral("openStandardFeedList"));
......
......@@ -25,15 +25,15 @@
#include <KLocalizedString>
AboutData::AboutData()
: KAboutData(QLatin1String("kaddressbook"),
: KAboutData(QStringLiteral("kaddressbook"),
i18n("KAddressBook"),
QLatin1String(KDEPIM_VERSION),
QStringLiteral(KDEPIM_VERSION),
i18n("The KDE Address Book Application"),
KAboutLicense::GPL_V2,
i18n("Copyright © 2007–2015 KAddressBook authors"))
{
addAuthor(i18n("Laurent Montel"), i18n("Current maintainer"), QLatin1String("montel@kde.org"));
addAuthor(i18n("Tobias Koenig"), i18n("Previous maintainer"), QLatin1String("tokoe@kde.org"));
addAuthor(i18n("Laurent Montel"), i18n("Current maintainer"), QStringLiteral("montel@kde.org"));
addAuthor(i18n("Tobias Koenig"), i18n("Previous maintainer"), QStringLiteral("tokoe@kde.org"));
}
AboutData::~AboutData()
......
......@@ -26,13 +26,13 @@ static void kaddressbook_options(QCommandLineParser *parser)
{
parser->addOption(
QCommandLineOption(
QLatin1String("import"),
QStringLiteral("import"),
i18n("Import the given file")));
parser->addPositionalArgument(
QLatin1String("urls"),
QStringLiteral("urls"),
i18n("Files or URLs. THe user will be asked whether to import."),
QLatin1String("[urls...]"));
QStringLiteral("[urls...]"));
}
#endif // KADDRESSBOOK_OPTIONS_H
......@@ -352,7 +352,7 @@ void MainWidget::handleCommandLine(const QStringList &arguments)
kaddressbook_options(&parser);
parser.process(arguments);
if (parser.isSet(QLatin1String("import"))) {
if (parser.isSet(QStringLiteral("import"))) {
for (const QString &url : parser.positionalArguments()) {
importManager()->importFile(QUrl::fromUserInput(url));
}
......
......@@ -360,14 +360,14 @@ static const about_data credits[] = {
};
AboutData::AboutData()
: KAboutData(QLatin1String("kmail2"),
: KAboutData(QStringLiteral("kmail2"),
i18n("KMail"),
QLatin1String(KDEPIM_VERSION),
QStringLiteral(KDEPIM_VERSION),
i18n("KDE Email Client"),
KAboutLicense::GPL,
i18n("Copyright © 1997–2015, KMail authors"),
QString(),
QLatin1String("http://userbase.kde.org/KMail"))
QStringLiteral("http://userbase.kde.org/KMail"))
{
setProgramIconName(QStringLiteral("kmail"));
using KMail::authors;
......
......@@ -10,49 +10,53 @@ static void kmail_options(QCommandLineParser *parser)
QList<QCommandLineOption> options;
options << QCommandLineOption(
QStringList() << QLatin1String("s") << QLatin1String("subject"),
i18n("Set subject of message"), QLatin1String("subject"))
QStringList() << QStringLiteral("s") << QStringLiteral("subject"),
i18n("Set subject of message"),
QStringLiteral("subject"))
<< QCommandLineOption(
QStringList() << QLatin1String("c") << QLatin1String("cc"),
i18n("Send CC: to 'address'"), QLatin1String("address"))
QStringList() << QStringLiteral("c") << QStringLiteral("cc"),
i18n("Send CC: to 'address'"),
QStringLiteral("address"))
<< QCommandLineOption(
QStringList() << QLatin1String("b") << QLatin1String("bcc"),
i18n("Send BCC: to 'address'"), QLatin1String("address"))
QStringList() << QStringLiteral("b") << QStringLiteral("bcc"),
i18n("Send BCC: to 'address'"),
QStringLiteral("address"))
<< QCommandLineOption(
QStringList() << QLatin1String("h") << QLatin1String("replyTo"),
i18n("Set replyTo to 'address'"), QLatin1String("address"))
QStringList() << QStringLiteral("h") << QStringLiteral("replyTo"),
i18n("Set replyTo to 'address'"),
QStringLiteral("address"))
<< QCommandLineOption(
QLatin1String("header"),
QStringLiteral("header"),
i18n("Add 'header' to message. This can be repeated"),
QLatin1String("header_name:header_value"))
QStringLiteral("header_name:header_value"))
<< QCommandLineOption(
QLatin1String("msg"),
QStringLiteral("msg"),
i18n("Read message body from 'file'"),
QLatin1String("file"))
QStringLiteral("file"))
<< QCommandLineOption(
QLatin1String("body"),
QStringLiteral("body"),
i18n("Set body of message"),
QLatin1String("text"))
QStringLiteral("text"))
<< QCommandLineOption(
QLatin1String("attach"),
QStringLiteral("attach"),
i18n("Add an attachment to the mail. This can be repeated"),
QLatin1String("url"))
QStringLiteral("url"))
<< QCommandLineOption(
QLatin1String("check"),
QStringLiteral("check"),
i18n("Only check for new mail"))
<< QCommandLineOption(
QLatin1String("composer"),
QStringLiteral("composer"),
i18n("Only open composer window"))
<< QCommandLineOption(
QLatin1String("view"),
QStringLiteral("view"),
i18n("View the given message file"),
QLatin1String("url"));
QStringLiteral("url"));
parser->addOptions(options);
parser->addPositionalArgument(
QLatin1String("address"),
QStringLiteral("address"),
i18n("Send message to 'address' or attach the file the 'URL' points to"),
QLatin1String("address|URL"));
QStringLiteral("address|URL"));
}
#endif
......@@ -301,8 +301,8 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
kmail_options(&parser);
parser.process(args);
if (parser.isSet(QLatin1String("subject"))) {
subj = parser.value(QLatin1String("subject"));
if (parser.isSet(QStringLiteral("subject"))) {
subj = parser.value(QStringLiteral("subject"));
// if kmail is called with 'kmail -session abc' then this doesn't mean
// that the user wants to send a message with subject "ession" but
// (most likely) that the user clicked on KMail's system tray applet
......@@ -310,7 +310,7 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
// via D-Bus which apparently executes the application with the original
// command line arguments and those include "-session ..." if
// kmail/kontact was restored by session management
if (subj == QLatin1String(QLatin1String("ession"))) {
if (subj == QLatin1String("ession")) {
subj.clear();
calledWithSession = true;
} else {
......@@ -320,33 +320,33 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
if (parser.isSet(QLatin1String("cc"))) {
if (parser.isSet(QStringLiteral("cc"))) {
mailto = true;
cc = parser.value(QLatin1String("cc"));
cc = parser.value(QStringLiteral("cc"));
}
if (parser.isSet(QLatin1String("bcc"))) {
if (parser.isSet(QStringLiteral("bcc"))) {
mailto = true;
bcc = parser.value(QLatin1String("bcc"));
bcc = parser.value(QStringLiteral("bcc"));
}
if (parser.isSet(QLatin1String("replyTo"))) {
if (parser.isSet(QStringLiteral("replyTo"))) {
mailto = true;
replyTo = parser.value(QLatin1String("replyTo"));
replyTo = parser.value(QStringLiteral("replyTo"));
}
if (parser.isSet(QLatin1String("msg"))) {
if (parser.isSet(QStringLiteral("msg"))) {
mailto = true;
const QString file = parser.value(QLatin1String("msg"));
const QString file = parser.value(QStringLiteral("msg"));
messageFile = makeAbsoluteUrl(file);
}
if (parser.isSet(QLatin1String("body"))) {
if (parser.isSet(QStringLiteral("body"))) {
mailto = true;
body = parser.value(QLatin1String("body"));
body = parser.value(QStringLiteral("body"));
}
const QStringList attachList = parser.values(QLatin1String("attach"));
const QStringList attachList = parser.values(QStringLiteral("attach"));
if (!attachList.isEmpty()) {
mailto = true;
QStringList::ConstIterator end = attachList.constEnd();
......@@ -360,20 +360,20 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
}
}
customHeaders = parser.values(QLatin1String("header"));
customHeaders = parser.values(QStringLiteral("header"));
if (parser.isSet(QLatin1String("composer"))) {
if (parser.isSet(QStringLiteral("composer"))) {
mailto = true;
}
if (parser.isSet(QLatin1String("check"))) {
if (parser.isSet(QStringLiteral("check"))) {
checkMail = true;
}
if (parser.isSet(QLatin1String("view"))) {
if (parser.isSet(QStringLiteral("view"))) {
viewOnly = true;
const QString filename =
parser.value(QLatin1String("view"));
parser.value(QStringLiteral("view"));
messageFile = QUrl::fromLocalFile(filename);
if (!messageFile.isValid()) {
messageFile = QUrl();
......@@ -385,24 +385,24 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
// only read additional command line arguments if kmail/kontact is
// not called with "-session foo"
for (const QString &arg : parser.positionalArguments()) {
if (arg.startsWith(QLatin1String("mailto:"), Qt::CaseInsensitive)) {
if (arg.startsWith(QStringLiteral("mailto:"), Qt::CaseInsensitive)) {
QMap<QString, QString> values = MessageCore::StringUtil::parseMailtoUrl(QUrl::fromUserInput(arg));
if (!values.value(QLatin1String("to")).isEmpty()) {
to += values.value(QLatin1String("to")) + QLatin1String(", ");
if (!values.value(QStringLiteral("to")).isEmpty()) {
to += values.value(QStringLiteral("to")) + QStringLiteral(", ");
}
if (!values.value(QLatin1String("cc")).isEmpty()) {
cc += values.value(QLatin1String("cc")) + QLatin1String(", ");
if (!values.value(QStringLiteral("cc")).isEmpty()) {
cc += values.value(QStringLiteral("cc")) + QStringLiteral(", ");
}
if (!values.value(QLatin1String("subject")).isEmpty()) {
subj = values.value(QLatin1String("subject"));
if (!values.value(QStringLiteral("subject")).isEmpty()) {
subj = values.value(QStringLiteral("subject"));
}
if (!values.value(QLatin1String("body")).isEmpty()) {
body = values.value(QLatin1String("body"));
if (!values.value(QStringLiteral("body")).isEmpty()) {
body = values.value(QStringLiteral("body"));
}
if (!values.value(QLatin1String("in-reply-to")).isEmpty()) {
inReplyTo = values.value(QLatin1String("in-reply-to"));
if (!values.value(QStringLiteral("in-reply-to")).isEmpty()) {
inReplyTo = values.value(QStringLiteral("in-reply-to"));
}
const QString attach = values.value(QLatin1String("attachment"));
const QString attach = values.value(QStringLiteral("attachment"));
if (!attach.isEmpty()) {
attachURLs << makeAbsoluteUrl(attach);
}
......@@ -411,7 +411,7 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader, const QStringList &args
if (url.isValid() && !url.scheme().isEmpty()) {
attachURLs += url;
} else {
to += arg + QLatin1String(", ");
to += arg + QStringLiteral(", ");
}
}
mailto = true;
......
......@@ -44,7 +44,7 @@ int Application::activate(const QStringList &args)
mMainWindow = new KNotesApp();
mMainWindow->show();
} else {
if (!parser->isSet(QLatin1String("skip-note"))) {
if (!parser->isSet(QStringLiteral("skip-note"))) {
mMainWindow->newNote();
}
}
......
......@@ -24,7 +24,7 @@
static void knotesOptions(QCommandLineParser *parser)
{
parser->addOption(QCommandLineOption(
QLatin1String("skip-note"),
QStringLiteral("skip-note"),
i18n("Suppress creation of a new note on a non-unique instance.")));
}
......
......@@ -48,9 +48,9 @@ int main(int argc, char *argv[])
migrate.setConfigFiles(QStringList() << QStringLiteral("knotesrc"));
migrate.migrate();
KAboutData aboutData(QLatin1String("knotes"),
KAboutData aboutData(QStringLiteral("knotes"),
i18n("KNotes"),
QLatin1String(KDEPIM_VERSION),
QStringLiteral(KDEPIM_VERSION),
i18n("KDE Notes"),
KAboutLicense::GPL,
i18n("Copyright © 1997–2015 KNotes authors"));
......@@ -110,49 +110,49 @@ void knotesAuthors(KAboutData &aboutData)
{
aboutData.addAuthor(i18n("Laurent Montel"),
i18n("Maintainer"),
QLatin1String("montel@kde.org"));
QStringLiteral("montel@kde.org"));
aboutData.addAuthor(i18n("Guillermo Antonio Amaral Bastidas"),
i18n("Previous Maintainer"),
QLatin1String("me@guillermoamaral.com"));
QStringLiteral("me@guillermoamaral.com"));
aboutData.addAuthor(i18n("Michael Brade"),
i18n("Previous Maintainer"),
QLatin1String("brade@kde.org"));
QStringLiteral("brade@kde.org"));
aboutData.addAuthor(i18n("Bernd Johannes Wuebben"),
i18n("Original KNotes Author"),
QLatin1String("wuebben@kde.org"));
QStringLiteral("wuebben@kde.org"));
aboutData.addAuthor(i18n("Wynn Wilkes"),
i18n("Ported KNotes to KDE 2"),
QLatin1String("wynnw@calderasystems.com"));
QStringLiteral("wynnw@calderasystems.com"));
aboutData.addAuthor(i18n("Daniel Martin"),
i18n("Network Interface"),
QLatin1String("daniel.martin@pirack.com"));
QStringLiteral("daniel.martin@pirack.com"));
aboutData.addAuthor(i18n("Bo Thorsen"),
i18n("Started KDE Resource Framework Integration"),
QLatin1String("bo@sonofthor.dk"));
QStringLiteral("bo@sonofthor.dk"));
aboutData.addCredit(i18n("Bera Debajyoti"),
i18n("Idea and initial code for the new look & feel"),
QLatin1String("debajyotibera@gmail.com"));
QStringLiteral("debajyotibera@gmail.com"));
aboutData.addCredit(i18n("Matthias Ettrich"),
QString(),
QLatin1String("ettrich@kde.org"));
QStringLiteral("ettrich@kde.org"));
aboutData.addCredit(i18n("David Faure"),
QString(),
QLatin1String("faure@kde.org"));
QStringLiteral("faure@kde.org"));
aboutData.addCredit(i18n("Matthias Kiefer"),
QString(),
QLatin1String("kiefer@kde.org"));
QStringLiteral("kiefer@kde.org"));
aboutData.addCredit(i18n("Luboš Luňák"),
QLatin1String("l.lunak@kde.org"));
QStringLiteral("l.lunak@kde.org"));
aboutData.addCredit(i18n("Dirk A. Mueller"),
QString(),
QLatin1String("dmuell@gmx.net"));
QStringLiteral("dmuell@gmx.net"));
aboutData.addCredit(i18n("Carsten Pfeiffer"),
QString(),
QLatin1String("pfeiffer@kde.org"));
QStringLiteral("pfeiffer@kde.org"));
aboutData.addCredit(i18n("Harri Porten"),
QString(),
QLatin1String("porten@kde.org"));
QStringLiteral("porten@kde.org"));
aboutData.addCredit(i18n("Espen Sand"),
QString(),
QLatin1String("espen@kde.org"));
QStringLiteral("espen@kde.org"));
}
......@@ -103,14 +103,14 @@ static void listPlugins()
static void loadCommandLineOptions(QCommandLineParser *parser)
{
parser->addOption(QCommandLineOption(
QLatin1String("module"),
QStringLiteral("module"),
i18n("Start with a specific Kontact module"),
QLatin1String("module")));
QStringLiteral("module")));
parser->addOption(QCommandLineOption(
QLatin1String("iconify"),
QStringLiteral("iconify"),
i18n("Start in iconified (minimized) mode")));
parser->addOption(QCommandLineOption(
QLatin1String("list"),
QStringLiteral("list"),
i18n("List all possible modules and exit")));
}
......@@ -124,8 +124,8 @@ int KontactApp::activate(const QStringList &args)
if (Prefs::self()->forceStartupPlugin()) {
moduleName = Prefs::self()->forcedStartupPlugin();
}
if (parser.isSet(QLatin1String("module"))) {
moduleName = parser.value(QLatin1String("module"));
if (parser.isSet(QStringLiteral("module"))) {
moduleName = parser.value(QStringLiteral("module"));
}
if (!mSessionRestored) {
if (!mMainWindow) {
......@@ -137,7 +137,7 @@ int KontactApp::activate(const QStringList &args)
KontactInterface::UniqueAppHandler::setMainWidget(mMainWindow);
// --iconify is needed in kontact, although kstart can do that too,
// because kstart returns immediately so it's too early to talk D-Bus to the app.
if (parser.isSet(QLatin1String("iconify"))) {
if (parser.isSet(QStringLiteral("iconify"))) {
KWindowSystem::minimizeWindow(mMainWindow->winId(), false /*no animation*/);
}
} else {
......@@ -163,28 +163,28 @@ int main(int argc, char **argv)
migrate.setUiFiles(QStringList() << QStringLiteral("kontactui.rc"));
migrate.migrate();
KAboutData about(QLatin1String("kontact"),
KAboutData about(QStringLiteral("kontact"),
i18n("Kontact"),
QLatin1String(version),
QStringLiteral(version),
i18n(description),
KAboutLicense::GPL,
i18n("Copyright © 2001–2015 Kontact authors"),
QString(),
QLatin1String("https://userbase.kde.org/Kontact"));
about.addAuthor(i18n("Allen Winter"), QString(), QLatin1String("winter@kde.org"));
about.addAuthor(i18n("Rafael Fernández López"), QString(), QLatin1String("ereslibre@kde.org"));
about.addAuthor(i18n("Daniel Molkentin"), QString(), QLatin1String("molkentin@kde.org"));
about.addAuthor(i18n("Don Sanders"), QString(), QLatin1String("sanders@kde.org"));
about.addAuthor(i18n("Cornelius Schumacher"), QString(), QLatin1String("schumacher@kde.org"));
about.addAuthor(i18n("Tobias K\303\266nig"), QString(), QLatin1String("tokoe@kde.org"));
about.addAuthor(i18n("David Faure"), QString(), QLatin1String("faure@kde.org"));
about.addAuthor(i18n("Ingo Kl\303\266cker"), QString(), QLatin1String("kloecker@kde.org"));
about.addAuthor(i18n("Sven L\303\274ppken"), QString(), QLatin1String("sven@kde.org"));
about.addAuthor(i18n("Zack Rusin"), QString(), QLatin1String("zack@kde.org"));
QStringLiteral("https://userbase.kde.org/Kontact"));
about.addAuthor(i18n("Allen Winter"), QString(), QStringLiteral("winter@kde.org"));
about.addAuthor(i18n("Rafael Fernández López"), QString(), QStringLiteral("ereslibre@kde.org"));
about.addAuthor(i18n("Daniel Molkentin"), QString(), QStringLiteral("molkentin@kde.org"));
about.addAuthor(i18n("Don Sanders"), QString(), QStringLiteral("sanders@kde.org"));
about.addAuthor(i18n("Cornelius Schumacher"), QString(), QStringLiteral("schumacher@kde.org"));
about.addAuthor(i18n("Tobias K\303\266nig"), QString(), QStringLiteral("tokoe@kde.org"));
about.addAuthor(i18n("David Faure"), QString(), QStringLiteral("faure@kde.org"));
about.addAuthor(i18n("Ingo Kl\303\266cker"), QString(), QStringLiteral("kloecker@kde.org"));
about.addAuthor(i18n("Sven L\303\274ppken"), QString(), QStringLiteral("sven@kde.org"));
about.addAuthor(i18n("Zack Rusin"), QString(), QStringLiteral("zack@kde.org"));
about.addAuthor(i18n("Matthias Hoelzer-Kluepfel"),
i18n("Original Author"), QLatin1String("mhk@kde.org"));
about.addCredit(i18n("Torgny Nyblom"), i18n("Git Migration"), QLatin1String("nyblom@kde.org"));
i18n("Original Author"), QStringLiteral("mhk@kde.org"));
about.addCredit(i18n("Torgny Nyblom"), i18n("Git Migration"), QStringLiteral("nyblom@kde.org"));
about.setOrganizationDomain("kde.org");
......@@ -196,7 +196,7 @@ int main(int argc, char **argv)
cmdArgs->process(args);
about.processCommandLine(cmdArgs);
if (cmdArgs->isSet(QLatin1String("list"))) {
if (cmdArgs->isSet(QStringLiteral("list"))) {
listPlugins();
return 0;
}
......
......@@ -30,9 +30,9 @@
using namespace KOrg;
AboutData::AboutData()
: KAboutData(QLatin1String("korganizer"),
: KAboutData(QStringLiteral("korganizer"),
i18n("KOrganizer"),
QLatin1String(KDEPIM_VERSION),
QStringLiteral(KDEPIM_VERSION),
i18n("A Personal Organizer"),
KAboutLicense::GPL,
i18n("Copyright © 1997–1999 Preston Brown\n"
......@@ -41,7 +41,7 @@ AboutData::AboutData()
"Copyright © 2006–2012 Allen Winter\n"
"Copyright © 2012–2015 KOrganizer authors"),
QString(),
QLatin1String("https://userbase.kde.org/KOrganizer"))
QStringLiteral("https://userbase.kde.org/KOrganizer"))
{
#if defined( KDEPIM_GIT_REVISION_STRING ) && defined( KDEPIM_GIT_LAST_CHANGE )
const QByteArray rev(KDEPIM_GIT_REVISION_STRING);
......@@ -54,15 +54,15 @@ AboutData::AboutData()
#endif
addAuthor(i18n("Allen Winter"), i18n("Maintainer"),
QLatin1String("winter@kde.org"));
QStringLiteral("winter@kde.org"));
addAuthor(i18n("Reinhold Kainhofer"), i18n("Former Maintainer"),
QLatin1String("reinhold@kainhofer.com"));
QStringLiteral("reinhold@kainhofer.com"));
addAuthor(i18n("Cornelius Schumacher"), i18n("Former Maintainer"),
QLatin1String("schumacher@kde.org"));
QStringLiteral("schumacher@kde.org"));
addAuthor(i18n("Preston Brown"), i18n("Original Author"),
QLatin1String("pbrown@kde.org"));
QStringLiteral("pbrown@kde.org"));
addAuthor(i18n("Laurent Montel"), i18n("Developer"),
QLatin1String("montel@kde.org"));
QStringLiteral("montel@kde.org"));
addCredit(i18n("Richard Apodaca"));
addCredit(i18n("Björn Balazs"));
addCredit(i18n("Jan-Pascal van Best"));
......
......@@ -1384,11 +1384,11 @@ bool ActionManager::handleCommandLine(const QStringList &args)
mainWindow->topLevelWidget()->show();
// Check for import, merge or ask
if (parser.isSet(QLatin1String("import"))) {
if (parser.isSet(QStringLiteral("import"))) {
for (const QString &url : parser.positionalArguments()) {
importURL(QUrl::fromUserInput(url), /*merge=*/false);
}
} else if (parser.isSet(QLatin1String("merge"))) {
} else if (parser.isSet(QStringLiteral("merge"))) {
for (const QString &url : parser.positionalArguments()) {
importURL(QUrl::fromUserInput(url), /*merge=*/true);
}
......
......@@ -90,11 +90,11 @@ int KOrganizerApp::activate(const QStringList &args)
return -1;
}
// Check for import, merge or ask
if (parser.isSet(QLatin1String("import"))) {
if (parser.isSet(QStringLiteral("import"))) {