[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-04-30 20:59:58
Message-ID: E1YnvYs-0005Rp-UI () scm ! kde ! org
[Download RAW message or body]
Git commit 4a72fd1ecb3ebc084ba463a490d2315a1a98f632 by Montel Laurent.
Committed on 30/04/2015 at 20:59.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral
M +2 -2 akonadiconsole/agentconfigmodel.cpp
M +4 -4 akonadiconsole/jobtracker.cpp
M +14 -14 akonadiconsole/notificationmodel.cpp
M +1 -1 akonadiconsole/rawsocketconsole.cpp
M +18 -18 blogilo/src/bilboblog.cpp
M +1 -1 blogilo/src/bilbomedia.cpp
M +2 -2 blogilo/src/composer/blogilocomposereditor.cpp
M +1 -1 blogilo/src/mainwindow.cpp
M +0 -1 grantleeeditor/grantleethemeeditor/themesession.cpp
M +10 -2 kdepim.categories
M +1 -1 kmail/antispam-virus/antispamwizard.cpp
M +1 -1 kmail/configuredialog/configurecomposerpage.cpp
M +1 -1 kmail/dialog/archivefolderdialog.cpp
M +1 -1 kmail/identity/xfaceconfigurator.cpp
M +1 -1 kmail/kmmainwin.cpp
M +16 -16 kmail/kontactplugin/kmail_plugin.cpp
M +2 -2 kmail/tag/tagactionmanager.cpp
M +1 -1 messagecomposer/attachment/attachmentcontrollerbase.cpp
M +2 -2 pimsettingexporter/abstractimportexportjob.cpp
M +3 -2 pimsettingexporter/pimsettingcommandlineoption.cpp
http://commits.kde.org/kdepim/4a72fd1ecb3ebc084ba463a490d2315a1a98f632
diff --git a/akonadiconsole/agentconfigmodel.cpp \
b/akonadiconsole/agentconfigmodel.cpp index bcb002f..81ba16c 100644
--- a/akonadiconsole/agentconfigmodel.cpp
+++ b/akonadiconsole/agentconfigmodel.cpp
@@ -39,7 +39,7 @@ void AgentConfigModel::setAgentInstance(const \
Akonadi::AgentInstance &instance) reset();
m_interface = new QDBusInterface(
- QString::fromLatin1("org.freedesktop.Akonadi.Agent.%1").arg(instance.identifier()),
+ QStringLiteral("org.freedesktop.Akonadi.Agent.%1").arg(instance.identifier()),
"/Settings");
if (!m_interface->isValid()) {
qCritical() << "Unable to obtain KConfigXT D-Bus interface of agent" << \
instance.identifier(); @@ -117,7 +117,7 @@ bool AgentConfigModel::setData(const \
QModelIndex &index, const QVariant &value,
if (index.column() == 1 && role == Qt::EditRole && index.row() >= 0 && \
index.row() < m_settings.size()) {
const QPair<QString, QVariant> setting = m_settings.at(index.row());
if (setting.second != value) {
- m_interface->call(QString::fromLatin1("set%1").arg(setting.first), \
value); + m_interface->call(QStringLiteral("set%1").arg(setting.first), \
value); reload();
}
}
diff --git a/akonadiconsole/jobtracker.cpp b/akonadiconsole/jobtracker.cpp
index be192d3..892e261 100644
--- a/akonadiconsole/jobtracker.cpp
+++ b/akonadiconsole/jobtracker.cpp
@@ -34,15 +34,15 @@ QString JobInfo::stateAsString() const
{
switch (state) {
case Initial:
- return QLatin1String("Waiting");
+ return QStringLiteral("Waiting");
case Running:
- return QLatin1String("Running");
+ return QStringLiteral("Running");
case Ended:
- return QLatin1String("Ended");
+ return QStringLiteral("Ended");
case Failed:
return QStringLiteral("Failed: %1").arg(error);
default:
- return QLatin1String("Unknown state!");
+ return QStringLiteral("Unknown state!");
}
}
diff --git a/akonadiconsole/notificationmodel.cpp \
b/akonadiconsole/notificationmodel.cpp index dc5662b..5c46701 100644
--- a/akonadiconsole/notificationmodel.cpp
+++ b/akonadiconsole/notificationmodel.cpp
@@ -257,24 +257,24 @@ QVariant NotificationModel::data(const QModelIndex &index, int \
role) const switch (index.column()) {
case 0: {
switch (node->operation) {
- case NotificationMessageV2::Add: return QLatin1String("Add");
- case NotificationMessageV2::Modify: return QLatin1String("Modify");
- case NotificationMessageV2::ModifyFlags: return \
QLatin1String("ModifyFlags");
- case NotificationMessageV2::ModifyTags: return \
QLatin1String("ModifyTags");
- case NotificationMessageV2::Move: return QLatin1String("Move");
- case NotificationMessageV2::Remove: return QLatin1String("Delete");
- case NotificationMessageV2::Link: return QLatin1String("Link");
- case NotificationMessageV2::Unlink: return QLatin1String("Unlink");
- case NotificationMessageV2::Subscribe: return \
QLatin1String("Subscribe");
- case NotificationMessageV2::Unsubscribe: return \
QLatin1String("Unsubscribe"); + case NotificationMessageV2::Add: \
return QStringLiteral("Add"); + case NotificationMessageV2::Modify: \
return QStringLiteral("Modify"); + case \
NotificationMessageV2::ModifyFlags: return QStringLiteral("ModifyFlags"); + \
case NotificationMessageV2::ModifyTags: return QStringLiteral("ModifyTags"); + \
case NotificationMessageV2::Move: return QStringLiteral("Move"); + \
case NotificationMessageV2::Remove: return QStringLiteral("Delete"); + \
case NotificationMessageV2::Link: return QStringLiteral("Link"); + \
case NotificationMessageV2::Unlink: return QStringLiteral("Unlink"); + \
case NotificationMessageV2::Subscribe: return QStringLiteral("Subscribe"); + \
case NotificationMessageV2::Unsubscribe: return QStringLiteral("Unsubscribe"); \
default: return QString("Invalid"); }
}
case 1: {
switch (node->type) {
- case NotificationMessageV2::Collections: return \
QLatin1String("Collections");
- case NotificationMessageV2::Items: return QLatin1String("Items");
- case NotificationMessageV2::Tags: return QLatin1String("Tags");
+ case NotificationMessageV2::Collections: return \
QStringLiteral("Collections"); + case NotificationMessageV2::Items: \
return QStringLiteral("Items"); + case NotificationMessageV2::Tags: \
return QStringLiteral("Tags"); default: return QString("Invalid");
}
}
@@ -351,7 +351,7 @@ void NotificationModel::clear()
void NotificationModel::setEnabled(bool enable)
{
if (enable && !m_source) {
- const QString identifier = \
QString::fromLatin1("akonadiconsole_%1_notificationmodel").arg(QString::number(QCoreApplication::applicationPid()));
+ const QString identifier = \
QStringLiteral("akonadiconsole_%1_notificationmodel").arg(QString::number(QCoreApplication::applicationPid()));
m_manager->subscribe(identifier);
QString service = QLatin1String("org.freedesktop.Akonadi");
diff --git a/akonadiconsole/rawsocketconsole.cpp \
b/akonadiconsole/rawsocketconsole.cpp index bd48a83..3734370 100644
--- a/akonadiconsole/rawsocketconsole.cpp
+++ b/akonadiconsole/rawsocketconsole.cpp
@@ -115,7 +115,7 @@ void RawSocketConsole::connectClicked()
const QString namedPipe = conSettings.value(QLatin1String("Data/NamedPipe"), \
QLatin1String("Akonadi")).toString(); mSocket->connectToServer(namedPipe);
#else
- const QString defaultSocketDir = XdgBaseDirs::saveDir("data", \
QLatin1String("akonadi")); + const QString defaultSocketDir = \
XdgBaseDirs::saveDir("data", QStringLiteral("akonadi"));
const QString path = conSettings.value(QLatin1String("Data/UnixPath"), \
QString(defaultSocketDir + QLatin1String("/akonadiserver.socket"))).toString(); \
mSocket->connectToServer(path); #endif
diff --git a/blogilo/src/bilboblog.cpp b/blogilo/src/bilboblog.cpp
index 4114a6a..b25f516 100644
--- a/blogilo/src/bilboblog.cpp
+++ b/blogilo/src/bilboblog.cpp
@@ -179,34 +179,34 @@ void BilboBlog::setApi(const ApiType api)
d->mApi = api;
switch (api) {
case BLOGGER1_API:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = false;
- d->mSupportedFeatures[QLatin1String("category")] = false;
- d->mSupportedFeatures[QLatin1String("tag")] = false;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = false;
+ d->mSupportedFeatures[QStringLiteral("category")] = false;
+ d->mSupportedFeatures[QStringLiteral("tag")] = false;
break;
case METAWEBLOG_API:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = true;
- d->mSupportedFeatures[QLatin1String("category")] = true;
- d->mSupportedFeatures[QLatin1String("tag")] = false;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = true;
+ d->mSupportedFeatures[QStringLiteral("category")] = true;
+ d->mSupportedFeatures[QStringLiteral("tag")] = false;
break;
case MOVABLETYPE_API:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = true;
- d->mSupportedFeatures[QLatin1String("category")] = true;
- d->mSupportedFeatures[QLatin1String("tag")] = true;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = true;
+ d->mSupportedFeatures[QStringLiteral("category")] = true;
+ d->mSupportedFeatures[QStringLiteral("tag")] = true;
break;
case WORDPRESSBUGGY_API:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = true;
- d->mSupportedFeatures[QLatin1String("category")] = true;
- d->mSupportedFeatures[QLatin1String("tag")] = true;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = true;
+ d->mSupportedFeatures[QStringLiteral("category")] = true;
+ d->mSupportedFeatures[QStringLiteral("tag")] = true;
break;
case BLOGGER_API:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = false;
- d->mSupportedFeatures[QLatin1String("category")] = false;
- d->mSupportedFeatures[QLatin1String("tag")] = true;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = false;
+ d->mSupportedFeatures[QStringLiteral("category")] = false;
+ d->mSupportedFeatures[QStringLiteral("tag")] = true;
break;
default:
- d->mSupportedFeatures[QLatin1String("uploadMedia")] = false;
- d->mSupportedFeatures[QLatin1String("category")] = false;
- d->mSupportedFeatures[QLatin1String("tag")] = false;
+ d->mSupportedFeatures[QStringLiteral("uploadMedia")] = false;
+ d->mSupportedFeatures[QStringLiteral("category")] = false;
+ d->mSupportedFeatures[QStringLiteral("tag")] = false;
break;
}
}
diff --git a/blogilo/src/bilbomedia.cpp b/blogilo/src/bilbomedia.cpp
index 1b59937..d06f558 100644
--- a/blogilo/src/bilbomedia.cpp
+++ b/blogilo/src/bilbomedia.cpp
@@ -134,7 +134,7 @@ QIcon BilboMedia::icon() const
QPixmap iconPic;
QString type;
type = this->mimeType();
- if (type.contains(QLatin1String("image")) && !this->localUrl().isEmpty()) {
+ if (type.contains(QStringLiteral("image")) && !this->localUrl().isEmpty()) {
iconPic.load(this->localUrl().toLocalFile());
// iconPic.scaled(64, 64, Qt::IgnoreAspectRatio);
iconPic.scaledToHeight(32);
diff --git a/blogilo/src/composer/blogilocomposereditor.cpp \
b/blogilo/src/composer/blogilocomposereditor.cpp index 7a2a3fd..8c195c1 100644
--- a/blogilo/src/composer/blogilocomposereditor.cpp
+++ b/blogilo/src/composer/blogilocomposereditor.cpp
@@ -82,11 +82,11 @@ BlogiloComposerEditor::BlogiloComposerEditor(BlogiloComposerView \
*view, QWidget
KToolBar *mainToolBar = createToolBar(toolBarActions);
- mActSplitPost = new QAction(QIcon::fromTheme(QLatin1String("insert-more-mark")), \
i18n("Split text"), this); + mActSplitPost = new \
QAction(QIcon::fromTheme(QStringLiteral("insert-more-mark")), i18n("Split text"), \
this);
connect(mActSplitPost, &QAction::triggered, this, \
&BlogiloComposerEditor::slotAddPostSplitter); addActionInToolBar(mActSplitPost, \
mainToolBar);
- mActCode = new QAction(QIcon::fromTheme(QLatin1String("format-text-code")), \
i18nc("Sets text font to code style", + mActCode = new \
QAction(QIcon::fromTheme(QStringLiteral("format-text-code")), i18nc("Sets text font \
to code style", "Code"), this);
connect(mActCode, &QAction::triggered, this, \
&BlogiloComposerEditor::slotToggleCode); addActionInToolBar(mActCode, mainToolBar);
diff --git a/blogilo/src/mainwindow.cpp b/blogilo/src/mainwindow.cpp
index 180a73d..6e314db 100644
--- a/blogilo/src/mainwindow.cpp
+++ b/blogilo/src/mainwindow.cpp
@@ -364,7 +364,7 @@ void MainWindow::slotDialogDestroyed(QObject *win)
{
const QSize size = qobject_cast<QWidget *>(win)->size();
const QString name = win->objectName();
- if (name == QLatin1String("settings")) {
+ if (name == QStringLiteral("settings")) {
Settings::setConfigWindowSize(size);
}
}
diff --git a/grantleeeditor/grantleethemeeditor/themesession.cpp \
b/grantleeeditor/grantleethemeeditor/themesession.cpp index 4ac9862..2230c39 100644
--- a/grantleeeditor/grantleethemeeditor/themesession.cpp
+++ b/grantleeeditor/grantleethemeeditor/themesession.cpp
@@ -16,7 +16,6 @@
*/
#include "themesession.h"
-
#include <KConfig>
#include <KConfigGroup>
#include <QDebug>
diff --git a/kdepim.categories b/kdepim.categories
index 197c3ca..71d7ed1 100644
--- a/kdepim.categories
+++ b/kdepim.categories
@@ -16,7 +16,7 @@ log_kwatchgnupg kdepim (kwatchgnupg)
log_templateparser kdepim (templateparser)
log_koalarmclient kdepim (koalarmclient)
log_blogilo kdepim (blogilo)
-log_messagelist kdepim (messagelist
+log_messagelist kdepim (messagelist)
log_accountwizard kdepim (accountwizard)
log_kleo_ui kdepim (kleo_ui)
log_gpgme_backend kdepim (gpgme_backend)
@@ -31,7 +31,7 @@ log_pimcommon kdepim (pimcommon)
log_knotes kdepim (knotes)
log_composereditorng kdepim (composereditorng)
log_akonadiconsole kdepim (akonadiconsole)
-log_messacore kdepim (messacore)
+log_messacore kdepim (messagecore)
log_kmail kdepim (kmail)
log_noteshared kdepim (noteshared)
log_kalarm kdepim (kalarm)
@@ -51,3 +51,11 @@ log_headerthemeeditor kdepim (headerthemeeditor)
log_contactthemeeditor kdepim (contactthemeeditor)
log_kmail_plugin kdepim (kmail kontact plugins)
log_kaddressbook_plugin kdepim (kaddressbook kontact plugins)
+log_text_calendar kdepim (messageviewer calendar plugins)
+log_ktnefapps kdepim (ktnef apps)
+kmanagersieve_log kdepim (libksieve manager)
+log_mailfilteragent kdepim (mailfilter agent)
+log_notesagentagent kdepim (note agent)
+log_kleopatra kdepim (kleopatra)
+log_konsolekalendar kdepim (konsolekalendar)
+log_korganizer_picoftheday_plugins kdepim (korganizer picoftheday plugins)
diff --git a/kmail/antispam-virus/antispamwizard.cpp \
b/kmail/antispam-virus/antispamwizard.cpp index b7440ea..4dfc26b 100644
--- a/kmail/antispam-virus/antispamwizard.cpp
+++ b/kmail/antispam-virus/antispamwizard.cpp
@@ -871,7 +871,7 @@ ASWizPage::ASWizPage(QWidget *parent, const QString &name)
: QWidget(parent)
{
setObjectName(name);
- const QString banner = QLatin1String("kmwizard.png");
+ const QString banner = QStringLiteral("kmwizard.png");
mLayout = new QHBoxLayout(this);
QVBoxLayout *sideLayout = new QVBoxLayout();
diff --git a/kmail/configuredialog/configurecomposerpage.cpp \
b/kmail/configuredialog/configurecomposerpage.cpp index 3e94edf..90c08b6 100644
--- a/kmail/configuredialog/configurecomposerpage.cpp
+++ b/kmail/configuredialog/configurecomposerpage.cpp
@@ -310,7 +310,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
mAutoSave->setMinimum(0);
mAutoSave->setSingleStep(1);
mAutoSave->setValue(1);
- mAutoSave->setObjectName(QLatin1String("kcfg_AutosaveInterval"));
+ mAutoSave->setObjectName(QStringLiteral("kcfg_AutosaveInterval"));
mAutoSave->setSpecialValueText(i18n("No autosave"));
mAutoSave->setSuffix(ki18ncp("Interval suffix", " minute", " minutes"));
diff --git a/kmail/dialog/archivefolderdialog.cpp \
b/kmail/dialog/archivefolderdialog.cpp index eb7753b..a7d49a9 100644
--- a/kmail/dialog/archivefolderdialog.cpp
+++ b/kmail/dialog/archivefolderdialog.cpp
@@ -59,7 +59,7 @@ QString ArchiveFolderDialog::standardArchivePath(const QString \
&folderName) ArchiveFolderDialog::ArchiveFolderDialog(QWidget *parent)
: QDialog(parent), mParentWidget(parent)
{
- setObjectName(QLatin1String("archive_folder_dialog"));
+ setObjectName(QStringLiteral("archive_folder_dialog"));
setWindowTitle(i18nc("@title:window for archiving a folder", "Archive Folder"));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); QVBoxLayout *topLayout = new QVBoxLayout;
diff --git a/kmail/identity/xfaceconfigurator.cpp \
b/kmail/identity/xfaceconfigurator.cpp index 789ad84..b28965d 100644
--- a/kmail/identity/xfaceconfigurator.cpp
+++ b/kmail/identity/xfaceconfigurator.cpp
@@ -67,7 +67,7 @@ XFaceConfigurator::XFaceConfigurator(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *vlay = new QVBoxLayout(this);
- vlay->setObjectName(QLatin1String("main layout"));
+ vlay->setObjectName(QStringLiteral("main layout"));
vlay->setMargin(0);
QHBoxLayout *hlay = new QHBoxLayout();
vlay->addLayout(hlay);
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index a820327..500d1e3 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -49,7 +49,7 @@ KMMainWin::KMMainWin(QWidget *)
: KXmlGuiWindow(Q_NULLPTR),
mReallyClose(false)
{
- setObjectName(QLatin1String("kmail-mainwindow#"));
+ setObjectName(QStringLiteral("kmail-mainwindow#"));
// Set this to be the group leader for all subdialogs - this means
// modal subdialogs will only affect this dialog, not the other windows
setAttribute(Qt::WA_GroupLeader);
diff --git a/kmail/kontactplugin/kmail_plugin.cpp \
b/kmail/kontactplugin/kmail_plugin.cpp index 0067b3c..7fe0faa 100644
--- a/kmail/kontactplugin/kmail_plugin.cpp
+++ b/kmail/kontactplugin/kmail_plugin.cpp
@@ -52,12 +52,12 @@ EXPORT_KONTACT_PLUGIN(KMailPlugin, kmail)
KMailPlugin::KMailPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "kmail2"), m_instance(Q_NULLPTR)
{
- setComponentName(QLatin1String("kmail2"), QLatin1String("kmail2"));
+ setComponentName(QStringLiteral("kmail2"), QStringLiteral("kmail2"));
QAction *action =
- new QAction(QIcon::fromTheme(QLatin1String("mail-message-new")),
+ new QAction(QIcon::fromTheme(QStringLiteral("mail-message-new")),
i18nc("@action:inmenu", "New Message..."), this);
- actionCollection()->addAction(QLatin1String("new_mail"), action);
+ actionCollection()->addAction(QStringLiteral("new_mail"), action);
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT \
+ Qt::Key_M)); //action->setHelpText(
// i18nc( "@info:status", "Create a new mail message" ) );
@@ -69,7 +69,7 @@ KMailPlugin::KMailPlugin(KontactInterface::Core *core, const \
QVariantList &) insertNewAction(action);
QAction *syncAction =
- new QAction(QIcon::fromTheme(QLatin1String("view-refresh")),
+ new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")),
i18nc("@action:inmenu", "Sync Mail"), this);
//syncAction->setHelpText(
// i18nc( "@info:status", "Synchronize groupware mail" ) );
@@ -77,7 +77,7 @@ KMailPlugin::KMailPlugin(KontactInterface::Core *core, const \
QVariantList &) i18nc("@info:whatsthis",
"Choose this option to synchronize your groupware email."));
connect(syncAction, &QAction::triggered, this, &KMailPlugin::slotSyncFolders);
- actionCollection()->addAction(QLatin1String("sync_mail"), syncAction);
+ actionCollection()->addAction(QStringLiteral("sync_mail"), syncAction);
insertSyncAction(syncAction);
mUniqueAppWatcher = new KontactInterface::UniqueAppWatcher(
@@ -111,7 +111,7 @@ void KMailPlugin::processDropEvent(QDropEvent *de)
const QMimeData *md = de->mimeData();
if (VCalDrag::fromMimeData(md, cal) || ICalDrag::fromMimeData(md, cal)) {
- QTemporaryFile tmp(QLatin1String("incidences-kmail_XXXXXX.ics"));
+ QTemporaryFile tmp(QStringLiteral("incidences-kmail_XXXXXX.ics"));
tmp.setAutoRemove(false);
tmp.open();
FileStorage storage(cal, tmp.fileName());
@@ -124,7 +124,7 @@ void KMailPlugin::processDropEvent(QDropEvent *de)
for (it = list.constBegin(); it != end; ++it) {
to.append((*it).fullEmail());
}
- openComposer(to.join(QLatin1String(", ")));
+ openComposer(to.join(QStringLiteral(", ")));
}
qCWarning(KMAILPLUGIN_LOG) << QStringLiteral("Cannot handle drop events of type \
'%1'.").arg(de->mimeData()->formats().join(QLatin1Char(';'))); @@ -161,9 +161,9 @@ \
void KMailPlugin::slotNewMail() void KMailPlugin::slotSyncFolders()
{
QDBusMessage message =
- QDBusMessage::createMethodCall(QLatin1String("org.kde.kmail"), \
QLatin1String("/KMail"),
- QLatin1String("org.kde.kmail.kmail"),
- QLatin1String("checkMail"));
+ QDBusMessage::createMethodCall(QStringLiteral("org.kde.kmail"), \
QStringLiteral("/KMail"), + \
QStringLiteral("org.kde.kmail.kmail"), + \
QStringLiteral("checkMail")); QDBusConnection::sessionBus().send(message);
}
@@ -175,7 +175,7 @@ KMailPlugin::~KMailPlugin()
bool KMailPlugin::createDBUSInterface(const QString &serviceType)
{
- if (serviceType == QLatin1String("DBUS/Mailer")) {
+ if (serviceType == QStringLiteral("DBUS/Mailer")) {
if (part()) {
return true;
}
@@ -185,7 +185,7 @@ bool KMailPlugin::createDBUSInterface(const QString &serviceType)
QString KMailPlugin::tipFile() const
{
- const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QLatin1String("kmail2/tips")); + const QString file = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("kmail2/tips")); return file;
}
@@ -197,14 +197,14 @@ KParts::ReadOnlyPart *KMailPlugin::createPart()
}
m_instance = new OrgKdeKmailKmailInterface(
- QLatin1String("org.kde.kmail"), QLatin1String("/KMail"), \
QDBusConnection::sessionBus()); + QStringLiteral("org.kde.kmail"), \
QStringLiteral("/KMail"), QDBusConnection::sessionBus());
return part;
}
QStringList KMailPlugin::invisibleToolbarActions() const
{
- return QStringList() << QLatin1String("new_message");
+ return QStringList() << QStringLiteral("new_message");
}
bool KMailPlugin::isRunningStandalone() const
@@ -229,7 +229,7 @@ int KMailUniqueAppHandler::newInstance()
{
// Ensure part is loaded
(void)plugin()->part();
- org::kde::kmail::kmail kmail(QLatin1String("org.kde.kmail"), \
QLatin1String("/KMail"), QDBusConnection::sessionBus()); + org::kde::kmail::kmail \
kmail(QStringLiteral("org.kde.kmail"), QStringLiteral("/KMail"), \
QDBusConnection::sessionBus()); QDBusReply<bool> reply = \
kmail.handleCommandLine(false);
if (reply.isValid()) {
@@ -243,7 +243,7 @@ int KMailUniqueAppHandler::newInstance()
bool KMailPlugin::queryClose() const
{
- org::kde::kmail::kmail kmail(QLatin1String("org.kde.kmail"), \
QLatin1String("/KMail"), QDBusConnection::sessionBus()); + org::kde::kmail::kmail \
kmail(QStringLiteral("org.kde.kmail"), QStringLiteral("/KMail"), \
QDBusConnection::sessionBus()); QDBusReply<bool> canClose = kmail.canQueryClose();
return canClose;
}
diff --git a/kmail/tag/tagactionmanager.cpp b/kmail/tag/tagactionmanager.cpp
index 315c95e..112f964 100644
--- a/kmail/tag/tagactionmanager.cpp
+++ b/kmail/tag/tagactionmanager.cpp
@@ -79,7 +79,7 @@ void TagActionManager::clearActions()
//Remove the tag actions from the toolbar
if (!mToolbarActions.isEmpty()) {
if (mGUIClient->factory()) {
- mGUIClient->unplugActionList(QLatin1String("toolbar_messagetag_actions"));
+ mGUIClient->unplugActionList(QStringLiteral("toolbar_messagetag_actions"));
}
mToolbarActions.clear();
}
@@ -117,7 +117,7 @@ void TagActionManager::clearActions()
void TagActionManager::createTagAction(const MailCommon::Tag::Ptr &tag, bool \
addToMenu) {
QString cleanName(i18n("Message Tag: %1", tag->tagName));
- cleanName.replace(QLatin1Char('&'), QLatin1String("&&"));
+ cleanName.replace(QLatin1Char('&'), QStringLiteral("&&"));
KToggleAction *const tagAction = new \
KToggleAction(QIcon::fromTheme(tag->iconName), cleanName, this);
tagAction->setShortcut(QKeySequence(tag->shortcut));
diff --git a/messagecomposer/attachment/attachmentcontrollerbase.cpp \
b/messagecomposer/attachment/attachmentcontrollerbase.cpp index af17e85..4d9beb3 \
100644
--- a/messagecomposer/attachment/attachmentcontrollerbase.cpp
+++ b/messagecomposer/attachment/attachmentcontrollerbase.cpp
@@ -415,7 +415,7 @@ void \
AttachmentControllerBase::Private::attachPublicKeyJobResult(KJob *job) void \
AttachmentControllerBase::Private::attachVcardFromAddressBook(KJob *job) {
if (job->error()) {
- qDebug() << " Error during when get vcard";
+ qCDebug(MESSAGECOMPOSER_LOG) << " Error during when get vcard";
return;
}
diff --git a/pimsettingexporter/abstractimportexportjob.cpp \
b/pimsettingexporter/abstractimportexportjob.cpp index 21afb7e..07d5cef 100644
--- a/pimsettingexporter/abstractimportexportjob.cpp
+++ b/pimsettingexporter/abstractimportexportjob.cpp
@@ -144,13 +144,13 @@ void AbstractImportExportJob::overwriteDirectory(const QString \
&path, const KArc if (overwriteDirectoryMessageBox(path)) {
const KArchiveDirectory *dirEntry = static_cast<const KArchiveDirectory \
*>(entry); if (!dirEntry->copyTo(path)) {
- qDebug() << "directory cannot overwrite to " << path;
+ qCDebug(PIMSETTINGEXPORTER_LOG) << "directory cannot overwrite to " \
<< path; }
}
} else {
const KArchiveDirectory *dirEntry = static_cast<const KArchiveDirectory \
*>(entry); if (dirEntry->copyTo(path)) {
- qDebug() << "directory cannot overwrite to " << path;
+ qCDebug(PIMSETTINGEXPORTER_LOG) << "directory cannot overwrite to " << \
path; }
}
}
diff --git a/pimsettingexporter/pimsettingcommandlineoption.cpp \
b/pimsettingexporter/pimsettingcommandlineoption.cpp index 5b65137..0017387 100644
--- a/pimsettingexporter/pimsettingcommandlineoption.cpp
+++ b/pimsettingexporter/pimsettingcommandlineoption.cpp
@@ -17,13 +17,14 @@
#include "pimsettingcommandlineoption.h"
#include "pimsettingexporterwindow.h"
+#include "pimsettingexport_debug.h"
#include "kdepim-version.h"
#include <KLocalizedString>
#include <KAboutData>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QApplication>
-#include <QDebug>
+
PimSettingCommandLineOption::PimSettingCommandLineOption(QObject *parent)
: QObject(parent),
@@ -41,7 +42,7 @@ void PimSettingCommandLineOption::slotActivateRequested(const \
QStringList &argum if (mParser.parse(arguments)) {
handleCommandLine();
} else {
- qDebug() << " Impossible to parse argument ";
+ qCDebug(PIMSETTINGEXPORTER_LOG) << " Impossible to parse argument ";
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic