[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Use QStringLiteral
From: Montel Laurent <montel () kde ! org>
Date: 2015-06-29 12:06:08
Message-ID: E1Z9XpA-0003Td-6e () scm ! kde ! org
[Download RAW message or body]
Git commit f0b82b4c781399469f7bc25356ae97b8fed572c9 by Montel Laurent.
Committed on 29/06/2015 at 11:19.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral
M +2 -2 kleopatra/aboutdata.cpp
M +2 -2 kleopatra/commands/changeroottrustcommand.cpp
M +2 -2 kleopatra/commands/exportopenpgpcertstoservercommand.cpp
M +1 -1 kleopatra/commands/learncardkeyscommand.cpp
M +2 -2 kleopatra/commands/lookupcertificatescommand.cpp
M +0 -2 kleopatra/conf/appearanceconfigpage.cpp
M +2 -2 kleopatra/conf/appearanceconfigwidget.cpp
M +0 -2 kleopatra/conf/cryptooperationsconfigpage.cpp
M +1 -3 kleopatra/conf/dirservconfigpage.cpp
M +0 -2 kleopatra/conf/gnupgsystemconfigurationpage.cpp
M +0 -2 kleopatra/conf/smimevalidationconfigurationpage.cpp
M +15 -15 kleopatra/crypto/gui/newsignencryptfileswizard.cpp
M +0 -1 kleopatra/crypto/gui/resultitemwidget.cpp
M +4 -4 kleopatra/kleopatraapplication.cpp
M +8 -8 kleopatra/tests/test_keylistmodels.cpp
M +6 -6 kleopatra/tests/test_useridlistmodels.cpp
M +12 -12 kleopatra/utils/classify.cpp
M +0 -1 kleopatra/utils/filedialog.cpp
M +1 -1 kleopatra/view/keylistcontroller.cpp
M +1 -1 libkleo/backends/chiasmus/chiasmusjob.cpp
M +4 -4 libkleo/backends/qgpgme/qgpgmebackend.cpp
M +1 -1 libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
M +1 -1 libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
M +1 -1 libkleo/kleo/cryptobackendfactory.cpp
M +6 -6 libkleo/ui/directoryserviceswidget.cpp
M +3 -2 libkleo/ui/dnattributeorderconfigwidget.cpp
M +5 -5 libkleo/ui/keyselectiondialog.cpp
M +3 -3 libkleo/ui/messagebox.cpp
http://commits.kde.org/kdepim/f0b82b4c781399469f7bc25356ae97b8fed572c9
diff --git a/kleopatra/aboutdata.cpp b/kleopatra/aboutdata.cpp
index 917036f..e58b96b 100644
--- a/kleopatra/aboutdata.cpp
+++ b/kleopatra/aboutdata.cpp
@@ -144,12 +144,12 @@ static QString gpg4win_version()
QProcess p;
p.setReadChannelMode(QProcess::MergedChannels);
- p.start(gpgConfPath(), QStringList(QLatin1String("--version")));
+ p.start(gpgConfPath(), QStringList(QStringLiteral("--version")));
if (!p.waitForFinished())
return QStringLiteral("%1 (%2)").arg(QLatin1String(gpg4win_version_guessed),
i18nc("Version string is a guess", \
"guessed")); const QString output = QTextStream(&p).readAll() ;
- QRegExp rx(QLatin1String("\\(Gpg4win\\s+([^\\s)]+)\\)"));
+ QRegExp rx(QStringLiteral("\\(Gpg4win\\s+([^\\s)]+)\\)"));
if (rx.indexIn(output) != -1) {
return rx.cap(1);
} else
diff --git a/kleopatra/commands/changeroottrustcommand.cpp \
b/kleopatra/commands/changeroottrustcommand.cpp index e7eaf42..db0667c 100644
--- a/kleopatra/commands/changeroottrustcommand.cpp
+++ b/kleopatra/commands/changeroottrustcommand.cpp
@@ -76,7 +76,7 @@ public:
: QThread(), Command::Private(qq, c),
mutex(),
trust(Key::Ultimate),
- trustListFile(QDir(gnupgHomeDirectory()).absoluteFilePath(QLatin1String("trustlist.txt"))),
+ trustListFile(QDir(gnupgHomeDirectory()).absoluteFilePath(QStringLiteral("trustlist.txt"))),
canceled(false)
{
@@ -299,7 +299,7 @@ QString change_trust_file(const QString &trustListFile, const \
QString &key, Key:
qCDebug(KLEOPATRA_LOG) << qPrintable(key) << " -> " << qPrintable(keyColon);
// ( 1) ( 2 ) \
( 3 )( 4)
- QRegExp rx(QLatin1String("\\s*(!?)\\s*([a-fA-F0-9]{40}|(?:[a-fA-F0-9]{2}:){19}[a-fA-F0-9]{2})\\s*([SsPp*])(.*)"));
+ QRegExp rx(QStringLiteral("\\s*(!?)\\s*([a-fA-F0-9]{40}|(?:[a-fA-F0-9]{2}:){19}[a-fA-F0-9]{2})\\s*([SsPp*])(.*)"));
bool found = false;
Q_FOREACH (const QByteArray &rawLine, trustListFileContents) {
diff --git a/kleopatra/commands/exportopenpgpcertstoservercommand.cpp \
b/kleopatra/commands/exportopenpgpcertstoservercommand.cpp index 2b5f483..46120c9 \
100644
--- a/kleopatra/commands/exportopenpgpcertstoservercommand.cpp
+++ b/kleopatra/commands/exportopenpgpcertstoservercommand.cpp
@@ -94,7 +94,7 @@ bool ExportOpenPGPCertsToServerCommand::preStartHook(QWidget \
*parent) const
"as the server to export \
to?</para>"),
i18nc("@title:window", "OpenPGP \
Certificate Export"),
KStandardGuiItem::cont(), \
KStandardGuiItem::cancel(),
- \
QLatin1String("warn-export-openpgp-missing-keyserver")) + \
QStringLiteral("warn-export-openpgp-missing-keyserver"))
!= KMessageBox::Continue) {
return false;
}
@@ -107,7 +107,7 @@ bool ExportOpenPGPCertsToServerCommand::preStartHook(QWidget \
*parent) const "<para>Are you sure you want to continue?</para>"),
i18nc("@title:window", "OpenPGP Certificate Export"),
KStandardGuiItem::cont(), KStandardGuiItem::cancel(),
- QLatin1String("warn-export-openpgp-nonrevocable"))
+ QStringLiteral("warn-export-openpgp-nonrevocable"))
== KMessageBox::Continue;
}
diff --git a/kleopatra/commands/learncardkeyscommand.cpp \
b/kleopatra/commands/learncardkeyscommand.cpp index acc73db..324a463 100644
--- a/kleopatra/commands/learncardkeyscommand.cpp
+++ b/kleopatra/commands/learncardkeyscommand.cpp
@@ -88,7 +88,7 @@ QString LearnCardKeysCommand::crashExitMessage(const QStringList \
&args) const return xi18nc("@info",
"<para>The GPG or GpgSM process that tried to learn the smart card \
"
"ended prematurely because of an unexpected error.</para>"
- "<para>Please check the output of <icode>%1</icode> for \
details.</para>", args.join(QLatin1String(" "))) ; + "<para>Please \
check the output of <icode>%1</icode> for details.</para>", \
args.join(QStringLiteral(" "))) ; }
QString LearnCardKeysCommand::errorExitMessage(const QStringList &) const
diff --git a/kleopatra/commands/lookupcertificatescommand.cpp \
b/kleopatra/commands/lookupcertificatescommand.cpp index 2696bf3..0a38bbc 100644
--- a/kleopatra/commands/lookupcertificatescommand.cpp
+++ b/kleopatra/commands/lookupcertificatescommand.cpp
@@ -253,7 +253,7 @@ void \
LookupCertificatesCommand::Private::slotSearchTextChanged(const QString &st \
dialog->setCertificates(std::vector<Key>()); }
- const QRegExp rx(QLatin1String("(?:0x|0X)?[0-9a-fA-F]{6,}"));
+ const QRegExp rx(QStringLiteral("(?:0x|0X)?[0-9a-fA-F]{6,}"));
if (rx.exactMatch(str))
information(str.startsWith(QStringLiteral("0x"), Qt::CaseInsensitive)
? i18n("<p>You seem to be searching for a fingerPrint or a \
key-id.</p>" @@ -265,7 +265,7 @@ void \
LookupCertificatesCommand::Private::slotSearchTextChanged(const \
QString &st
"Some require a \"0x\" prefix, while others require there \
be no such prefix.</p>"
"<p>If your search does not yield any results, try adding \
the 0x prefix to your search.</p>"), i18n("Hex-String Search"),
- QLatin1String("lookup-certificates-warn-0x-prefix"));
+ QStringLiteral("lookup-certificates-warn-0x-prefix"));
startKeyListJob(CMS, str);
startKeyListJob(OpenPGP, str);
diff --git a/kleopatra/conf/appearanceconfigpage.cpp \
b/kleopatra/conf/appearanceconfigpage.cpp index cb34883..5928f5f 100644
--- a/kleopatra/conf/appearanceconfigpage.cpp
+++ b/kleopatra/conf/appearanceconfigpage.cpp
@@ -51,9 +51,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage(QWidget \
*parent, const lay->addWidget(mWidget);
connect(mWidget, SIGNAL(changed()), this, SLOT(changed()));
-#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
-#endif
}
void AppearanceConfigurationPage::load()
diff --git a/kleopatra/conf/appearanceconfigwidget.cpp \
b/kleopatra/conf/appearanceconfigwidget.cpp index 2cfaede..ff72286 100644
--- a/kleopatra/conf/appearanceconfigwidget.cpp
+++ b/kleopatra/conf/appearanceconfigwidget.cpp
@@ -473,7 +473,7 @@ void AppearanceConfigWidget::load()
if (!config) {
return;
}
- const QStringList groups = \
config->groupList().filter(QRegExp(QLatin1String("^Key Filter #\\d+$"))); + const \
QStringList groups = config->groupList().filter(QRegExp(QStringLiteral("^Key Filter \
#\\d+$"))); Q_FOREACH (const QString &group, groups) {
//QListWidgetItem * item = new QListWidgetItem( d->categoriesLV );
apply_config(KConfigGroup(config, group), new \
QListWidgetItem(d->categoriesLV)); @@ -502,7 +502,7 @@ void \
AppearanceConfigWidget::save() }
// We know (assume) that the groups in the config object haven't changed,
// so we just iterate over them and over the listviewitems, and map one-to-one.
- const QStringList groups = \
config->groupList().filter(QRegExp(QLatin1String("^Key Filter #\\d+$"))); + const \
QStringList groups = config->groupList().filter(QRegExp(QStringLiteral("^Key Filter \
#\\d+$"))); #if 0
if (groups.isEmpty()) {
// If we created the default categories ourselves just now, then we need to \
make up their list
diff --git a/kleopatra/conf/cryptooperationsconfigpage.cpp \
b/kleopatra/conf/cryptooperationsconfigpage.cpp index 58506e2..fc42bf6 100644
--- a/kleopatra/conf/cryptooperationsconfigpage.cpp
+++ b/kleopatra/conf/cryptooperationsconfigpage.cpp
@@ -49,9 +49,7 @@ CryptoOperationsConfigurationPage::CryptoOperationsConfigurationPage(QWidget \
*pa lay->addWidget(mWidget);
connect(mWidget, SIGNAL(changed()), this, SLOT(changed()));
-#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
-#endif
}
void CryptoOperationsConfigurationPage::load()
diff --git a/kleopatra/conf/dirservconfigpage.cpp \
b/kleopatra/conf/dirservconfigpage.cpp index 23cbc2d..c23f4794 100644
--- a/kleopatra/conf/dirservconfigpage.cpp
+++ b/kleopatra/conf/dirservconfigpage.cpp
@@ -171,7 +171,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage(QWidget \
* ++row;
QLabel *label = new QLabel(i18n("LDAP &timeout (minutes:seconds):"), this);
mTimeout = new QTimeEdit(this);
- mTimeout->setDisplayFormat(QLatin1String("mm:ss"));
+ mTimeout->setDisplayFormat(QStringLiteral("mm:ss"));
connect(mTimeout, SIGNAL(timeChanged(QTime)), this, SLOT(changed()));
label->setBuddy(mTimeout);
glay->addWidget(label, row, 0);
@@ -197,9 +197,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage(QWidget \
* glay->setRowStretch(++row, 1);
glay->setColumnStretch(2, 1);
-#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
-#endif
}
static KUrl::List string2urls(const QString &str)
diff --git a/kleopatra/conf/gnupgsystemconfigurationpage.cpp \
b/kleopatra/conf/gnupgsystemconfigurationpage.cpp index 211282b..71097a4 100644
--- a/kleopatra/conf/gnupgsystemconfigurationpage.cpp
+++ b/kleopatra/conf/gnupgsystemconfigurationpage.cpp
@@ -61,9 +61,7 @@ GnuPGSystemConfigurationPage::GnuPGSystemConfigurationPage(QWidget \
*parent, cons
connect(mWidget, SIGNAL(changed()), this, SLOT(changed()));
-#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
-#endif
}
GnuPGSystemConfigurationPage::~GnuPGSystemConfigurationPage()
diff --git a/kleopatra/conf/smimevalidationconfigurationpage.cpp \
b/kleopatra/conf/smimevalidationconfigurationpage.cpp index c604602..4127461 100644
--- a/kleopatra/conf/smimevalidationconfigurationpage.cpp
+++ b/kleopatra/conf/smimevalidationconfigurationpage.cpp
@@ -51,9 +51,7 @@ SMimeValidationConfigurationPage::SMimeValidationConfigurationPage(QWidget \
*pare
connect(mWidget, SIGNAL(changed()), this, SLOT(changed()));
-#ifndef HAVE_UNBROKEN_KCMULTIDIALOG
load();
-#endif
}
void SMimeValidationConfigurationPage::load()
diff --git a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp \
b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp index 1e3e584..98bddbf 100644
--- a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
+++ b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
@@ -456,26 +456,26 @@ public:
m_archive.addItem(ad->label(), qVariantFromValue(ad));
}
- registerField(QLatin1String("files"), this, "files");
+ registerField(QStringLiteral("files"), this, "files");
- registerField(QLatin1String("signing-preset"), this, "signingPreset");
- registerField(QLatin1String("encryption-preset"), this, "encryptionPreset");
+ registerField(QStringLiteral("signing-preset"), this, "signingPreset");
+ registerField(QStringLiteral("encryption-preset"), this, \
"encryptionPreset");
- registerField(QLatin1String("signencrypt"), &m_signencrypt);
- registerField(QLatin1String("encrypt"), &m_encrypt);
- registerField(QLatin1String("sign"), &m_sign);
+ registerField(QStringLiteral("signencrypt"), &m_signencrypt);
+ registerField(QStringLiteral("encrypt"), &m_encrypt);
+ registerField(QStringLiteral("sign"), &m_sign);
- registerField(QLatin1String("armor"), &m_armor);
- registerField(QLatin1String("remove"), &m_removeSource);
+ registerField(QStringLiteral("armor"), &m_armor);
+ registerField(QStringLiteral("remove"), &m_removeSource);
- registerField(QLatin1String("archive"), &m_archiveCB);
- registerField(QLatin1String("archive-id"), &m_archive);
- registerField(QLatin1String("archive-name-pgp"), &m_archiveNamePgp, \
"fileName");
- registerField(QLatin1String("archive-name-cms"), &m_archiveNameCms, \
"fileName"); + registerField(QStringLiteral("archive"), &m_archiveCB);
+ registerField(QStringLiteral("archive-id"), &m_archive);
+ registerField(QStringLiteral("archive-name-pgp"), &m_archiveNamePgp, \
"fileName"); + registerField(QStringLiteral("archive-name-cms"), \
&m_archiveNameCms, "fileName");
- registerField(QLatin1String("signing-user-mutable"), this, \
"signingUserMutable");
- registerField(QLatin1String("encryption-user-mutable"), this, \
"encryptionUserMutable");
- registerField(QLatin1String("archive-user-mutable"), this, \
"archiveUserMutable"); + registerField(QStringLiteral("signing-user-mutable"), \
this, "signingUserMutable"); + \
registerField(QStringLiteral("encryption-user-mutable"), this, \
"encryptionUserMutable"); + \
registerField(QStringLiteral("archive-user-mutable"), this, "archiveUserMutable");
connect(&m_archive, SIGNAL(currentIndexChanged(int)),
this, SLOT(slotArchiveDefinitionChanged()));
diff --git a/kleopatra/crypto/gui/resultitemwidget.cpp \
b/kleopatra/crypto/gui/resultitemwidget.cpp index a079a90..a53e9b7 100644
--- a/kleopatra/crypto/gui/resultitemwidget.cpp
+++ b/kleopatra/crypto/gui/resultitemwidget.cpp
@@ -41,7 +41,6 @@
#include <KLocalizedString>
#include <QPushButton>
#include <KStandardGuiItem>
-#include <KUrl>
#include "kleopatra_debug.h"
#include <QHBoxLayout>
#include <QLabel>
diff --git a/kleopatra/kleopatraapplication.cpp b/kleopatra/kleopatraapplication.cpp
index ecf8e07..23c6ba1 100644
--- a/kleopatra/kleopatraapplication.cpp
+++ b/kleopatra/kleopatraapplication.cpp
@@ -61,8 +61,8 @@
#include <KLocalizedString>
#include <KCmdLineOptions>
#include "kleopatra_debug.h"
-#include <KUrl>
#include <KWindowSystem>
+#include <QUrl>
#include <QFile>
#include <QDir>
@@ -82,9 +82,9 @@ using namespace boost;
static void add_resources()
{
- KIconLoader::global()->addAppDir(QLatin1String("libkleopatra"));
- KIconLoader::global()->addAppDir(QLatin1String("kwatchgnupg"));
- KIconLoader::global()->addAppDir(QLatin1String("kdepim"));
+ KIconLoader::global()->addAppDir(QStringLiteral("libkleopatra"));
+ KIconLoader::global()->addAppDir(QStringLiteral("kwatchgnupg"));
+ KIconLoader::global()->addAppDir(QStringLiteral("kdepim"));
}
static const struct {
diff --git a/kleopatra/tests/test_keylistmodels.cpp \
b/kleopatra/tests/test_keylistmodels.cpp index 40e5a04..23ac207 100644
--- a/kleopatra/tests/test_keylistmodels.cpp
+++ b/kleopatra/tests/test_keylistmodels.cpp
@@ -105,19 +105,19 @@ int main(int argc, char *argv[])
KAboutData::setApplicationData(aboutData);
parser.addVersionOption();
parser.addHelpOption();
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("flat"), \
i18n("Perform flat certificate listing")));
- parser.addOption(QCommandLineOption(QStringList() << \
QLatin1String("hierarchical"), i18n("Perform hierarchical certificate \
listing")));
- parser.addOption(QCommandLineOption(QStringList() << \
QLatin1String("disable-smime"), i18n("Do not list SMIME \
certificates")));
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("secret"), \
i18n("List secret keys only"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("flat"), \
i18n("Perform flat certificate listing"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("hierarchical"), \
i18n("Perform hierarchical certificate listing"))); + \
parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("disable-smime"), i18n("Do not list SMIME certificates"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("secret"), \
i18n("List secret keys only")));
aboutData.setupCommandLine(&parser);
parser.process(app);
aboutData.processCommandLine(&parser);
- const bool showFlat = parser.isSet(QLatin1String("flat")) || \
!parser.isSet(QLatin1String("hierarchical"));
- const bool showHier = parser.isSet(QLatin1String("hierarchical")) || \
!parser.isSet(QLatin1String("flat"));
- const bool disablesmime = parser.isSet(QLatin1String("disable-smime"));
- const bool secretOnly = parser.isSet(QLatin1String("secret"));
+ const bool showFlat = parser.isSet(QStringLiteral("flat")) || \
!parser.isSet(QStringLiteral("hierarchical")); + const bool showHier = \
parser.isSet(QStringLiteral("hierarchical")) || \
!parser.isSet(QStringLiteral("flat")); + const bool disablesmime = \
parser.isSet(QStringLiteral("disable-smime")); + const bool secretOnly = \
parser.isSet(QStringLiteral("secret"));
qsrand(QDateTime::currentDateTime().toTime_t());
diff --git a/kleopatra/tests/test_useridlistmodels.cpp \
b/kleopatra/tests/test_useridlistmodels.cpp index 8c67415..196bfbf 100644
--- a/kleopatra/tests/test_useridlistmodels.cpp
+++ b/kleopatra/tests/test_useridlistmodels.cpp
@@ -172,30 +172,30 @@ static void start(const QString &str, Protocol proto)
int main(int argc, char *argv[])
{
- KAboutData aboutData(QLatin1String("test_useridlistmodels"), \
i18n("UserIDListModel Test"), QLatin1String("0.1")); + KAboutData \
aboutData(QStringLiteral("test_useridlistmodels"), i18n("UserIDListModel Test"), \
QStringLiteral("0.1")); QApplication app(argc, argv);
QCommandLineParser parser;
KAboutData::setApplicationData(aboutData);
parser.addVersionOption();
parser.addHelpOption();
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("p"), \
i18n("OpenPGP certificate to look up"), QLatin1String("pattern")));
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("x"), \
i18n("X.509 certificate to look up"), QLatin1String("pattern"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("p"), \
i18n("OpenPGP certificate to look up"), QStringLiteral("pattern"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("x"), \
i18n("X.509 certificate to look up"), QStringLiteral("pattern")));
aboutData.setupCommandLine(&parser);
parser.process(app);
aboutData.processCommandLine(&parser);
- if (parser.values(QLatin1String("p")).empty() && \
parser.values(QLatin1String("x")).empty()) { + if \
(parser.values(QStringLiteral("p")).empty() && \
parser.values(QStringLiteral("x")).empty()) { return 1;
}
try {
- Q_FOREACH (const QString &arg, parser.values(QLatin1String("p"))) {
+ Q_FOREACH (const QString &arg, parser.values(QStringLiteral("p"))) {
start(arg, OpenPGP);
}
- Q_FOREACH (const QString &arg, parser.values(QLatin1String("x"))) {
+ Q_FOREACH (const QString &arg, parser.values(QStringLiteral("x"))) {
start(arg, CMS);
}
diff --git a/kleopatra/utils/classify.cpp b/kleopatra/utils/classify.cpp
index a693d8b..e2555c9 100644
--- a/kleopatra/utils/classify.cpp
+++ b/kleopatra/utils/classify.cpp
@@ -235,39 +235,39 @@ QString Kleo::printableClassification(unsigned int \
classification) {
QStringList parts;
if (classification & CMS) {
- parts.push_back(QLatin1String("CMS"));
+ parts.push_back(QStringLiteral("CMS"));
}
if (classification & OpenPGP) {
- parts.push_back(QLatin1String("OpenPGP"));
+ parts.push_back(QStringLiteral("OpenPGP"));
}
if (classification & Binary) {
- parts.push_back(QLatin1String("Binary"));
+ parts.push_back(QStringLiteral("Binary"));
}
if (classification & Ascii) {
- parts.push_back(QLatin1String("Ascii"));
+ parts.push_back(QStringLiteral("Ascii"));
}
if (classification & DetachedSignature) {
- parts.push_back(QLatin1String("DetachedSignature"));
+ parts.push_back(QStringLiteral("DetachedSignature"));
}
if (classification & OpaqueSignature) {
- parts.push_back(QLatin1String("OpaqueSignature"));
+ parts.push_back(QStringLiteral("OpaqueSignature"));
}
if (classification & ClearsignedMessage) {
- parts.push_back(QLatin1String("ClearsignedMessage"));
+ parts.push_back(QStringLiteral("ClearsignedMessage"));
}
if (classification & CipherText) {
- parts.push_back(QLatin1String("CipherText"));
+ parts.push_back(QStringLiteral("CipherText"));
}
if (classification & Certificate) {
- parts.push_back(QLatin1String("Certificate"));
+ parts.push_back(QStringLiteral("Certificate"));
}
if (classification & ExportedPSM) {
- parts.push_back(QLatin1String("ExportedPSM"));
+ parts.push_back(QStringLiteral("ExportedPSM"));
}
if (classification & CertificateRequest) {
- parts.push_back(QLatin1String("CertificateRequest"));
+ parts.push_back(QStringLiteral("CertificateRequest"));
}
- return parts.join(QLatin1String(", "));
+ return parts.join(QStringLiteral(", "));
}
static QString chopped(QString s, unsigned int n)
diff --git a/kleopatra/utils/filedialog.cpp b/kleopatra/utils/filedialog.cpp
index 3386bd5..1fe4415 100644
--- a/kleopatra/utils/filedialog.cpp
+++ b/kleopatra/utils/filedialog.cpp
@@ -36,7 +36,6 @@
#ifdef QT_NO_FILEDIALOG
#include <KFileDialog>
-#include <KUrl>
#include <QTextStream>
#endif
#include <QFileDialog>
diff --git a/kleopatra/view/keylistcontroller.cpp \
b/kleopatra/view/keylistcontroller.cpp index 4dd71b2..11a118c 100644
--- a/kleopatra/view/keylistcontroller.cpp
+++ b/kleopatra/view/keylistcontroller.cpp
@@ -485,7 +485,7 @@ void KeyListController::createActions(KActionCollection *coll)
make_actions_from_data(action_data, coll);
- if (QAction *action = coll->action(QLatin1String("view_stop_operations"))) {
+ if (QAction *action = coll->action(QStringLiteral("view_stop_operations"))) {
connect(this, SIGNAL(commandsExecuting(bool)), action, \
SLOT(setEnabled(bool))); }
diff --git a/libkleo/backends/chiasmus/chiasmusjob.cpp \
b/libkleo/backends/chiasmus/chiasmusjob.cpp index 9fa0f7d..3a5fda8 100644
--- a/libkleo/backends/chiasmus/chiasmusjob.cpp
+++ b/libkleo/backends/chiasmus/chiasmusjob.cpp
@@ -88,7 +88,7 @@ GpgME::Error Kleo::ChiasmusJob::setup()
? SymCryptRunProcessBase::Encrypt
: SymCryptRunProcessBase::Decrypt,
this);
- mSymCryptRun->setObjectName(QLatin1String("symcryptrun"));
+ mSymCryptRun->setObjectName(QStringLiteral("symcryptrun"));
QTimer::singleShot(timeoutEntry->uintValue() * 1000, this,
SLOT(slotTimeout()));
return GpgME::Error();
diff --git a/libkleo/backends/qgpgme/qgpgmebackend.cpp \
b/libkleo/backends/qgpgme/qgpgmebackend.cpp index 225adf6..8de09d8 100644
--- a/libkleo/backends/qgpgme/qgpgmebackend.cpp
+++ b/libkleo/backends/qgpgme/qgpgmebackend.cpp
@@ -78,8 +78,8 @@ public:
QString name() const
{
switch (mProtocol) {
- case GpgME::OpenPGP: return QLatin1String("OpenPGP");
- case GpgME::CMS: return QLatin1String("SMIME");
+ case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
+ case GpgME::CMS: return QStringLiteral("SMIME");
default: return QString();
}
}
@@ -87,8 +87,8 @@ public:
QString displayName() const
{
switch (mProtocol) {
- case GpgME::OpenPGP: return QLatin1String("gpg");
- case GpgME::CMS: return QLatin1String("gpgsm");
+ case GpgME::OpenPGP: return QStringLiteral("gpg");
+ case GpgME::CMS: return QStringLiteral("gpgsm");
default: return i18n("unknown");
}
}
diff --git a/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp \
b/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 333e3ca..0c5321d 100644
--- a/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -87,7 +87,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess()
}
// create and start gpgsm process:
mProcess = new GnuPGProcessBase(this);
- mProcess->setObjectName(QLatin1String("gpgsm -k --with-validation \
--force-crl-refresh --enable-crl-checks")); + \
mProcess->setObjectName(QStringLiteral("gpgsm -k --with-validation \
--force-crl-refresh --enable-crl-checks"));
// FIXME: obbtain the path to gpgsm from gpgme, so we use the same instance.
*mProcess << QStringLiteral("gpgsm") << QStringLiteral("-k") << \
QStringLiteral("--with-validation") << \
QStringLiteral("--force-crl-refresh")
diff --git a/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp \
b/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index 40f50c6..78bb789 100644
--- a/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -74,7 +74,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start(const \
QStringList &patterns)
// create and start gpgsm process:
mProcess = new GnuPGProcessBase(this);
- mProcess->setObjectName(QLatin1String("gpgsm --export-secret-key-p12"));
+ mProcess->setObjectName(QStringLiteral("gpgsm --export-secret-key-p12"));
// FIXME: obtain the path to gpgsm from gpgme, so we use the same instance.
*mProcess << QStringLiteral("gpgsm") << \
QStringLiteral("--export-secret-key-p12");
diff --git a/libkleo/kleo/cryptobackendfactory.cpp \
b/libkleo/kleo/cryptobackendfactory.cpp index e4ee08d..dc55576 100644
--- a/libkleo/kleo/cryptobackendfactory.cpp
+++ b/libkleo/kleo/cryptobackendfactory.cpp
@@ -70,7 +70,7 @@ Kleo::CryptoBackendFactory::CryptoBackendFactory()
mConfigObject(0),
mAvailableProtocols(availableProtocols, availableProtocols + \
numAvailableProtocols) {
- setObjectName(QLatin1String("CryptoBackendFactory::instance()"));
+ setObjectName(QStringLiteral("CryptoBackendFactory::instance()"));
mBackendList.push_back(new QGpgMEBackend());
#if 0 // disabled for kde-3.3
mBackendList.push_back(new PGP2Backend());
diff --git a/libkleo/ui/directoryserviceswidget.cpp \
b/libkleo/ui/directoryserviceswidget.cpp index 1ca0d61..d08ded7 100644
--- a/libkleo/ui/directoryserviceswidget.cpp
+++ b/libkleo/ui/directoryserviceswidget.cpp
@@ -62,15 +62,15 @@ namespace
static QUrl defaultX509Service()
{
QUrl url;
- url.setScheme(QLatin1String("ldap"));
+ url.setScheme(QStringLiteral("ldap"));
url.setHost(i18nc("default server name, keep it a valid domain name, ie. no \
spaces", "server")); return url;
}
static QUrl defaultOpenPGPService()
{
QUrl url;
- url.setScheme(QLatin1String("hkp"));
- url.setHost(QLatin1String("keys.gnupg.net"));
+ url.setScheme(QStringLiteral("hkp"));
+ url.setHost(QStringLiteral("keys.gnupg.net"));
return url;
}
@@ -593,9 +593,9 @@ private:
newOpenPGPAction(i18nc("New OpenPGP Directory Server", "OpenPGP"), q),
newMenu(q)
{
- newX509Action.setObjectName(QLatin1String("newX509Action"));
- newOpenPGPAction.setObjectName(QLatin1String("newOpenPGPAction"));
- newMenu.setObjectName(QLatin1String("newMenu"));
+ newX509Action.setObjectName(QStringLiteral("newX509Action"));
+ newOpenPGPAction.setObjectName(QStringLiteral("newOpenPGPAction"));
+ newMenu.setObjectName(QStringLiteral("newMenu"));
setupUi(q);
diff --git a/libkleo/ui/dnattributeorderconfigwidget.cpp \
b/libkleo/ui/dnattributeorderconfigwidget.cpp index d6712de..f0f48a8 100644
--- a/libkleo/ui/dnattributeorderconfigwidget.cpp
+++ b/libkleo/ui/dnattributeorderconfigwidget.cpp
@@ -118,7 +118,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget(DNAttributeMapp
QGridLayout *xlay = new QGridLayout();
xlay->setSpacing(0);
- xlay->setObjectName(QLatin1String("xlay"));
+ xlay->setObjectName(QStringLiteral("xlay"));
xlay->setAlignment(Qt::AlignCenter);
static const struct {
@@ -183,7 +183,8 @@ void Kleo::DNAttributeOrderConfigWidget::load()
// fill the LHS listview with what's left:
const QStringList all = Kleo::DNAttributeMapper::instance()->names();
- for (QStringList::const_iterator it = all.begin() ; it != all.end() ; ++it) {
+ const QStringList::const_iterator end(all.end());
+ for (QStringList::const_iterator it = all.begin() ; it != end ; ++it) {
if (!order.contains(*it)) {
QTreeWidgetItem *item = new QTreeWidgetItem(d->availableLV);
item->setText(0, *it);
diff --git a/libkleo/ui/keyselectiondialog.cpp b/libkleo/ui/keyselectiondialog.cpp
index 6ca7fe1..f2396bc 100644
--- a/libkleo/ui/keyselectiondialog.cpp
+++ b/libkleo/ui/keyselectiondialog.cpp
@@ -194,10 +194,10 @@ private:
ColumnStrategy::ColumnStrategy(unsigned int keyUsage)
: Kleo::KeyListView::ColumnStrategy(),
- mKeyGoodPix(QLatin1String("key_ok")),
- mKeyBadPix(QLatin1String("key_bad")),
- mKeyUnknownPix(QLatin1String("key_unknown")),
- mKeyValidPix(QLatin1String("key")),
+ mKeyGoodPix(QStringLiteral("key_ok")),
+ mKeyBadPix(QStringLiteral("key_bad")),
+ mKeyUnknownPix(QStringLiteral("key_unknown")),
+ mKeyValidPix(QStringLiteral("key")),
mKeyUsage(keyUsage)
{
if (keyUsage == 0)
@@ -456,7 +456,7 @@ void Kleo::KeySelectionDialog::init(bool rememberChoice, bool \
extendedSelection,
connect(mStartSearchTimer, &QTimer::timeout, this, \
&KeySelectionDialog::slotFilter);
mKeyListView = new KeyListView(new ColumnStrategy(mKeyUsage), 0, page);
- mKeyListView->setObjectName(QLatin1String("mKeyListView"));
+ mKeyListView->setObjectName(QStringLiteral("mKeyListView"));
mKeyListView->header()->stretchLastSection();
mKeyListView->setRootIsDecorated(true);
mKeyListView->setSortingEnabled(true);
diff --git a/libkleo/ui/messagebox.cpp b/libkleo/ui/messagebox.cpp
index 5b141ee..809a5eb 100644
--- a/libkleo/ui/messagebox.cpp
+++ b/libkleo/ui/messagebox.cpp
@@ -109,7 +109,7 @@ AuditLogViewer::AuditLogViewer(const QString &log, QWidget \
*parent, Qt::WindowFl showButtonSeparator(false);
setModal(false);
setMainWidget(m_textEdit);
- m_textEdit->setObjectName(QLatin1String("m_textEdit"));
+ m_textEdit->setObjectName(QStringLiteral("m_textEdit"));
m_textEdit->setReadOnly(true);
setAuditLog(log);
@@ -234,7 +234,7 @@ void MessageBox::auditLog(QWidget *parent, const QString &log, \
const QString &ca {
AuditLogViewer *const alv = new AuditLogViewer(log, parent);
alv->setAttribute(Qt::WA_DeleteOnClose);
- alv->setObjectName(QLatin1String("alv"));
+ alv->setObjectName(QStringLiteral("alv"));
alv->setCaption(caption);
alv->show();
}
@@ -392,7 +392,7 @@ void MessageBox::make(QWidget *parent, QMessageBox::Icon icon, \
const QString &te QPushButton *yesButton = box->button(QDialogButtonBox::Yes);
yesButton->setDefault(true);
//dialog->setEscapeButton(KDialog::Yes);
- dialog->setObjectName(QLatin1String("error"));
+ dialog->setObjectName(QStringLiteral("error"));
dialog->setModal(true);
KGuiItem::assign(yesButton, KStandardGuiItem::ok());
if (GpgME::hasFeature(GpgME::AuditLogFeature)) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic