[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime] /: Use QStringLiteral
From: Montel Laurent <montel () kde ! org>
Date: 2015-04-29 20:51:58
Message-ID: E1YnYxa-0006XR-JA () scm ! kde ! org
[Download RAW message or body]
Git commit 751cd5984348146ab5be1c8b0c440a9bb5939695 by Montel Laurent.
Committed on 29/04/2015 at 20:51.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral
M +2 -2 kcm/akonadiconfigmodule.cpp
M +2 -2 kcm/resourcesmanagementwidget.cpp
M +10 -10 resources/birthdays/birthdaysresource.cpp
M +1 -1 resources/birthdays/configdialog.cpp
M +3 -4 resources/google/calendar/calendarresource.cpp
M +1 -1 resources/google/calendar/settings.cpp
M +3 -3 resources/google/calendar/settingsdialog.cpp
M +2 -2 resources/google/common/googleresource.cpp
M +2 -2 resources/google/common/googlesettings.cpp
M +2 -2 resources/google/common/googlesettingsdialog.cpp
M +16 -16 resources/google/contacts/contactsresource.cpp
M +1 -1 resources/google/contacts/settings.cpp
http://commits.kde.org/kdepim-runtime/751cd5984348146ab5be1c8b0c440a9bb5939695
diff --git a/kcm/akonadiconfigmodule.cpp b/kcm/akonadiconfigmodule.cpp
index 1d2e257..810392b 100644
--- a/kcm/akonadiconfigmodule.cpp
+++ b/kcm/akonadiconfigmodule.cpp
@@ -28,8 +28,8 @@ AkonadiConfigModule::AkonadiConfigModule(QWidget *parent, const \
QVariantList &ar {
Q_UNUSED(args);
setButtons(KCModule::Default | KCModule::Apply);
- addModule(QLatin1String("kcm_akonadi_resources"));
- addModule(QLatin1String("kcm_akonadi_server"));
+ addModule(QStringLiteral("kcm_akonadi_resources"));
+ addModule(QStringLiteral("kcm_akonadi_server"));
}
#include "akonadiconfigmodule.moc"
diff --git a/kcm/resourcesmanagementwidget.cpp b/kcm/resourcesmanagementwidget.cpp
index 924a1e5..5b95bc4 100644
--- a/kcm/resourcesmanagementwidget.cpp
+++ b/kcm/resourcesmanagementwidget.cpp
@@ -51,7 +51,7 @@ ResourcesManagementWidget::ResourcesManagementWidget(QWidget \
*parent, const QSt d->wantedMimeTypes = args;
d->ui.setupUi(this);
- d->ui.resourcesList->agentFilterProxyModel()->addCapabilityFilter(QLatin1String("Resource"));
+ d->ui.resourcesList->agentFilterProxyModel()->addCapabilityFilter(QStringLiteral("Resource"));
foreach (const QString &type, d->wantedMimeTypes) {
d->ui.resourcesList->agentFilterProxyModel()->addMimeTypeFilter(type);
}
@@ -83,7 +83,7 @@ void ResourcesManagementWidget::updateButtonState()
d->ui.removeButton->setEnabled(false);
} else {
const Akonadi::AgentInstance current = instanceList.first();
- d->ui.editButton->setEnabled(!current.type().capabilities().contains(QLatin1String("NoConfig")));
+ d->ui.editButton->setEnabled(!current.type().capabilities().contains(QStringLiteral("NoConfig")));
d->ui.removeButton->setEnabled(true);
}
}
diff --git a/resources/birthdays/birthdaysresource.cpp \
b/resources/birthdays/birthdaysresource.cpp index cde6139..95863c9 100644
--- a/resources/birthdays/birthdaysresource.cpp
+++ b/resources/birthdays/birthdaysresource.cpp
@@ -48,7 +48,7 @@ BirthdaysResource::BirthdaysResource(const QString &id) :
ResourceBase(id)
{
new SettingsAdaptor(Settings::self());
- QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"),
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"),
Settings::self(), QDBusConnection::ExportAdaptors);
setName(i18n("Birthdays & Anniversaries"));
@@ -86,13 +86,13 @@ void BirthdaysResource::retrieveCollections()
{
Collection c;
c.setParentCollection(Collection::root());
- c.setRemoteId(QLatin1String("akonadi_birthdays_resource"));
+ c.setRemoteId(QStringLiteral("akonadi_birthdays_resource"));
c.setName(name());
- c.setContentMimeTypes(QStringList() << \
QLatin1String("application/x-vnd.akonadi.calendar.event")); + \
c.setContentMimeTypes(QStringList() << \
QStringLiteral("application/x-vnd.akonadi.calendar.event")); \
c.setRights(Collection::ReadOnly);
EntityDisplayAttribute *attribute = \
c.attribute<EntityDisplayAttribute>(Collection::AddIfMissing);
- attribute->setIconName(QLatin1String("view-calendar-birthday"));
+ attribute->setIconName(QStringLiteral("view-calendar-birthday"));
Collection::List list;
list << c;
@@ -249,9 +249,9 @@ KCalCore::Event::Ptr BirthdaysResource::createBirthday(const \
Akonadi::Item &cont const QString summary = i18n("%1's birthday", name);
Event::Ptr ev = createEvent(birthdate);
- ev->setUid(contact.uid() + QLatin1String("_KABC_Birthday"));
+ ev->setUid(contact.uid() + QStringLiteral("_KABC_Birthday"));
- ev->setCustomProperty("KABC", "BIRTHDAY", QLatin1String("YES"));
+ ev->setCustomProperty("KABC", "BIRTHDAY", QStringLiteral("YES"));
ev->setCustomProperty("KABC", "UID-1", contact.uid());
ev->setCustomProperty("KABC", "NAME-1", name);
ev->setCustomProperty("KABC", "EMAIL-1", contact.preferredEmail());
@@ -276,13 +276,13 @@ KCalCore::Event::Ptr BirthdaysResource::createAnniversary(const \
Akonadi::Item &c return KCalCore::Event::Ptr();
}
- const QString anniversary_string = contact.custom(QLatin1String("KADDRESSBOOK"), \
QLatin1String("X-Anniversary")); + const QString anniversary_string = \
contact.custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Anniversary")); if \
(anniversary_string.isEmpty()) { return KCalCore::Event::Ptr();
}
const QDate anniversary = QDate::fromString(anniversary_string, Qt::ISODate);
if (anniversary.isValid()) {
- const QString spouseName = contact.custom(QLatin1String("KADDRESSBOOK"), \
QLatin1String("X-SpousesName")); + const QString spouseName = \
contact.custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-SpousesName"));
QString summary;
if (!spouseName.isEmpty()) {
@@ -308,13 +308,13 @@ KCalCore::Event::Ptr BirthdaysResource::createAnniversary(const \
Akonadi::Item &c }
Event::Ptr event = createEvent(anniversary);
- event->setUid(contact.uid() + QLatin1String("_KABC_Anniversary"));
+ event->setUid(contact.uid() + QStringLiteral("_KABC_Anniversary"));
event->setSummary(summary);
event->setCustomProperty("KABC", "UID-1", contact.uid());
event->setCustomProperty("KABC", "NAME-1", name);
event->setCustomProperty("KABC", "EMAIL-1", contact.fullEmail());
- event->setCustomProperty("KABC", "ANNIVERSARY", QLatin1String("YES"));
+ event->setCustomProperty("KABC", "ANNIVERSARY", QStringLiteral("YES"));
// insert category
checkForUnknownCategories(i18n("Anniversary"), event);
return event;
diff --git a/resources/birthdays/configdialog.cpp \
b/resources/birthdays/configdialog.cpp index 784994e..19fad2c 100644
--- a/resources/birthdays/configdialog.cpp
+++ b/resources/birthdays/configdialog.cpp
@@ -45,7 +45,7 @@ ConfigDialog::ConfigDialog(QWidget *parent)
mainLayout->addWidget(mainWidget);
mainLayout->addWidget(buttonBox);
ui.setupUi(mainWidget);
- setWindowIcon(QIcon::fromTheme(QLatin1String("view-calendar-birthday")));
+ setWindowIcon(QIcon::fromTheme(QStringLiteral("view-calendar-birthday")));
mManager = new KConfigDialogManager(this, Settings::self());
mManager->updateWidgets();
ui.kcfg_AlarmDays->setSuffix(ki18np(" day", " days"));
diff --git a/resources/google/calendar/calendarresource.cpp \
b/resources/google/calendar/calendarresource.cpp index 3e26daa..ca948b4 100644
--- a/resources/google/calendar/calendarresource.cpp
+++ b/resources/google/calendar/calendarresource.cpp
@@ -75,7 +75,6 @@ CalendarResource::CalendarResource(const QString &id):
GoogleResource(id)
{
AttributeFactory::registerAttribute< DefaultReminderAttribute >();
- //QT5 KLocalizedString::global()->insertCatalog( \
QLatin1String("akonadi_google_resource") ); updateResourceName();
}
@@ -91,7 +90,7 @@ GoogleSettings *CalendarResource::settings() const
int CalendarResource::runConfigurationDialog(WId windowId)
{
QScopedPointer<SettingsDialog> settingsDialog(new \
SettingsDialog(accountManager(), windowId, this));
- settingsDialog->setWindowIcon(QIcon::fromTheme(QLatin1String("im-google")));
+ settingsDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("im-google")));
return settingsDialog->exec();
}
@@ -417,7 +416,7 @@ void CalendarResource::slotCollectionsRetrieved(KGAPI2::Job *job)
EntityDisplayAttribute *attr = \
m_rootCollection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing); \
attr->setDisplayName(fetchJob->account()->accountName());
- attr->setIconName(QLatin1String("im-google"));
+ attr->setIconName(QStringLiteral("im-google"));
m_collections[ ROOT_COLLECTION_REMOTEID ] = m_rootCollection;
@@ -479,7 +478,7 @@ void CalendarResource::slotCollectionsRetrieved(KGAPI2::Job *job)
EntityDisplayAttribute *attr = \
collection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing); \
attr->setDisplayName(taskList->title());
- attr->setIconName(QLatin1String("view-pim-tasks"));
+ attr->setIconName(QStringLiteral("view-pim-tasks"));
m_collections[ collection.remoteId() ] = collection;
}
diff --git a/resources/google/calendar/settings.cpp \
b/resources/google/calendar/settings.cpp index 6444acf..8a2a713 100644
--- a/resources/google/calendar/settings.cpp
+++ b/resources/google/calendar/settings.cpp
@@ -47,7 +47,7 @@ Settings::Settings():
s_globalSettings->q = this;
new SettingsAdaptor(this);
- QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"), this,
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this,
QDBusConnection::ExportAdaptors | \
QDBusConnection::ExportScriptableContents); }
diff --git a/resources/google/calendar/settingsdialog.cpp \
b/resources/google/calendar/settingsdialog.cpp index c0b12c1..5789d6c 100644
--- a/resources/google/calendar/settingsdialog.cpp
+++ b/resources/google/calendar/settingsdialog.cpp
@@ -52,7 +52,7 @@ SettingsDialog::SettingsDialog(GoogleAccountManager \
*accountManager, WId windowI m_calendarsList = new QListWidget(m_calendarsBox);
vbox->addWidget(m_calendarsList, 1);
- m_reloadCalendarsBtn = new \
QPushButton(QIcon::fromTheme(QLatin1String("view-refresh")), i18n("Reload"), \
m_calendarsBox); + m_reloadCalendarsBtn = new \
QPushButton(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Reload"), \
m_calendarsBox); vbox->addWidget(m_reloadCalendarsBtn);
connect(m_reloadCalendarsBtn, &QPushButton::clicked, this, \
&SettingsDialog::slotReloadCalendars);
@@ -65,7 +65,7 @@ SettingsDialog::SettingsDialog(GoogleAccountManager \
*accountManager, WId windowI m_eventsLimitCombo = new KDateComboBox(this);
m_eventsLimitLabel->setBuddy(m_eventsLimitCombo);
m_eventsLimitCombo->setMaximumDate(QDate::currentDate());
- m_eventsLimitCombo->setMinimumDate(QDate::fromString(QLatin1String("2000-01-01"), \
Qt::ISODate)); + m_eventsLimitCombo->setMinimumDate(QDate::fromString(QStringLiteral("2000-01-01"), \
Qt::ISODate));
m_eventsLimitCombo->setOptions(KDateComboBox::EditDate | \
KDateComboBox::SelectDate |
KDateComboBox::DatePicker | \
KDateComboBox::WarnOnInvalid); if (Settings::self()->eventsSince().isEmpty()) {
@@ -84,7 +84,7 @@ SettingsDialog::SettingsDialog(GoogleAccountManager \
*accountManager, WId windowI m_taskListsList = new QListWidget(m_taskListsBox);
vbox->addWidget(m_taskListsList, 1);
- m_reloadTaskListsBtn = new \
QPushButton(QIcon::fromTheme(QLatin1String("view-refresh")), i18n("Reload"), \
m_taskListsBox); + m_reloadTaskListsBtn = new \
QPushButton(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Reload"), \
m_taskListsBox); vbox->addWidget(m_reloadTaskListsBtn);
connect(m_reloadTaskListsBtn, &QPushButton::clicked, this, \
&SettingsDialog::slotReloadTaskLists); }
diff --git a/resources/google/common/googleresource.cpp \
b/resources/google/common/googleresource.cpp index 9c8ae41..d8c53e5 100644
--- a/resources/google/common/googleresource.cpp
+++ b/resources/google/common/googleresource.cpp
@@ -46,7 +46,7 @@ GoogleResource::GoogleResource(const QString &id):
AgentBase::ObserverV2(),
m_isConfiguring(false)
{
- //QT5 KLocalizedString::global()->insertCatalog( \
QLatin1String("akonadi_google_resource") ); + //QT5 \
KLocalizedString::global()->insertCatalog( QStringLiteral("akonadi_google_resource") \
);
connect(this, &GoogleResource::abortRequested, this, \
&GoogleResource::slotAbortRequested);
connect(this, &GoogleResource::reloadConfiguration, this, \
&GoogleResource::reloadConfig);
@@ -191,7 +191,7 @@ void GoogleResource::slotKAccountsCredentialsReceived(KJob *job)
GetCredentialsJob *gc = qobject_cast<GetCredentialsJob *>(job);
const QVariantMap data = gc->credentialsData();
- const QString accessToken = data.value(QLatin1String("AccessToken")).toString();
+ const QString accessToken = \
data.value(QStringLiteral("AccessToken")).toString();
// Createa temporary account that we use to fetch full user name
KGAPI2::AccountPtr account(new KGAPI2::Account);
diff --git a/resources/google/common/googlesettings.cpp \
b/resources/google/common/googlesettings.cpp index 9c480f3..f0d9347 100644
--- a/resources/google/common/googlesettings.cpp
+++ b/resources/google/common/googlesettings.cpp
@@ -25,12 +25,12 @@ GoogleSettings::GoogleSettings():
QString GoogleSettings::clientId() const
{
- return QLatin1String("554041944266.apps.googleusercontent.com");
+ return QStringLiteral("554041944266.apps.googleusercontent.com");
}
QString GoogleSettings::clientSecret() const
{
- return QLatin1String("mdT1DjzohxN3npUUzkENT0gO");
+ return QStringLiteral("mdT1DjzohxN3npUUzkENT0gO");
}
void GoogleSettings::setWindowId(WId id)
diff --git a/resources/google/common/googlesettingsdialog.cpp \
b/resources/google/common/googlesettingsdialog.cpp index 8700bd0..0607a76 100644
--- a/resources/google/common/googlesettingsdialog.cpp
+++ b/resources/google/common/googlesettingsdialog.cpp
@@ -74,11 +74,11 @@ GoogleSettingsDialog::GoogleSettingsDialog(GoogleAccountManager \
*accountManager, accLayout->addWidget(m_accComboBox, 1);
connect(m_accComboBox, static_cast<void (KComboBox::*)(const QString \
&)>(&KComboBox::currentIndexChanged), this, \
&GoogleSettingsDialog::currentAccountChanged);
- m_addAccButton = new \
QPushButton(QIcon::fromTheme(QLatin1String("list-add-user")), i18n("&Add"), \
m_accGroupBox); + m_addAccButton = new \
QPushButton(QIcon::fromTheme(QStringLiteral("list-add-user")), i18n("&Add"), \
m_accGroupBox); accLayout->addWidget(m_addAccButton);
connect(m_addAccButton, &QPushButton::clicked, this, \
&GoogleSettingsDialog::slotAddAccountClicked);
- m_removeAccButton = new \
QPushButton(QIcon::fromTheme(QLatin1String("list-remove-user")), i18n("&Remove"), \
m_accGroupBox); + m_removeAccButton = new \
QPushButton(QIcon::fromTheme(QStringLiteral("list-remove-user")), i18n("&Remove"), \
m_accGroupBox); accLayout->addWidget(m_removeAccButton);
connect(m_removeAccButton, &QPushButton::clicked, this, \
&GoogleSettingsDialog::slotRemoveAccountClicked);
diff --git a/resources/google/contacts/contactsresource.cpp \
b/resources/google/contacts/contactsresource.cpp index a7e1ed1..f08b91e 100644
--- a/resources/google/contacts/contactsresource.cpp
+++ b/resources/google/contacts/contactsresource.cpp
@@ -53,8 +53,8 @@
#include <KGAPI/Contacts/ContactsGroupFetchJob>
#include <KGAPI/Contacts/ContactsGroupModifyJob>
-#define MYCONTACTS_REMOTEID QLatin1String( "MyContacts" )
-#define OTHERCONTACTS_REMOTEID QLatin1String( "OtherContacts" )
+#define MYCONTACTS_REMOTEID QStringLiteral( "MyContacts" )
+#define OTHERCONTACTS_REMOTEID QStringLiteral( "OtherContacts" )
Q_DECLARE_METATYPE(KGAPI2::Job *)
Q_DECLARE_METATYPE(QList<QString>)
@@ -81,7 +81,7 @@ int ContactsResource::runConfigurationDialog(WId windowId)
{
QScopedPointer<SettingsDialog> settingsDialog(new \
SettingsDialog(accountManager(), windowId, this));
- settingsDialog->setWindowIcon(QIcon::fromTheme(QLatin1String("im-google")));
+ settingsDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("im-google")));
return settingsDialog->exec();
}
@@ -130,9 +130,9 @@ void ContactsResource::retrieveContactsPhotos(const QVariant \
&arguments) }
const QVariantMap map = arguments.toMap();
- const Collection collection = map[ QLatin1String("collection") \
].value<Collection>(); + const Collection collection = map[ \
QStringLiteral("collection") ].value<Collection>(); ItemFetchJob *itemFetchJob = new \
ItemFetchJob(collection, this);
- itemFetchJob->setProperty("modifiedItems", map[ QLatin1String("modifiedItems") \
]); + itemFetchJob->setProperty("modifiedItems", map[ \
QStringLiteral("modifiedItems") ]); \
itemFetchJob->fetchScope().fetchFullPayload(true);
connect(itemFetchJob, &ItemFetchJob::finished, this, \
&ContactsResource::slotUpdatePhotosItemsRetrieved); emit status(Running, \
i18nc("@info:status", "Retrieving photos")); @@ -345,7 +345,7 @@ void \
ContactsResource::slotCollectionsRetrieved(KGAPI2::Job *job)
EntityDisplayAttribute *attr = \
m_rootCollection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing); \
attr->setDisplayName(fetchJob->account()->accountName());
- attr->setIconName(QLatin1String("im-google"));
+ attr->setIconName(QStringLiteral("im-google"));
m_collections[ MYCONTACTS_REMOTEID ] = m_rootCollection;
@@ -355,18 +355,18 @@ void ContactsResource::slotCollectionsRetrieved(KGAPI2::Job \
*job) QString realName = group->title();
if (group->isSystemGroup()) {
- if (group->title().contains(QLatin1String("Coworkers"))) {
+ if (group->title().contains(QStringLiteral("Coworkers"))) {
realName = i18nc("Name of a group of contacts", "Coworkers");
- } else if (group->title().contains(QLatin1String("Friends"))) {
+ } else if (group->title().contains(QStringLiteral("Friends"))) {
realName = i18nc("Name of a group of contacts", "Friends");
- } else if (group->title().contains(QLatin1String("Family"))) {
+ } else if (group->title().contains(QStringLiteral("Family"))) {
realName = i18nc("Name of a group of contacts", "Family");
- } else if (group->title().contains(QLatin1String("My Contacts"))) {
+ } else if (group->title().contains(QStringLiteral("My Contacts"))) {
// Yes, skip My Contacts group, we store "My Contacts" in root \
collection continue;
}
} else {
- if (group->title().contains(QLatin1String("Other Contacts"))) {
+ if (group->title().contains(QStringLiteral("Other Contacts"))) {
realName = i18nc("Name of a group of contacts", "Other Contacts");
}
}
@@ -388,7 +388,7 @@ void ContactsResource::slotCollectionsRetrieved(KGAPI2::Job *job)
EntityDisplayAttribute *attr = \
collection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing); \
attr->setDisplayName(realName);
- attr->setIconName(QLatin1String("view-pim-contacts"));
+ attr->setIconName(QStringLiteral("view-pim-contacts"));
m_collections[ collection.remoteId() ] = collection;
}
@@ -404,7 +404,7 @@ void ContactsResource::slotCollectionsRetrieved(KGAPI2::Job *job)
attr = otherCollection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing);
attr->setDisplayName(i18n("Other Contacts"));
- attr->setIconName(QLatin1String("view-pim-contacts"));
+ attr->setIconName(QStringLiteral("view-pim-contacts"));
m_collections[ OTHERCONTACTS_REMOTEID ] = otherCollection;
collectionsRetrieved(m_collections.values());
@@ -462,8 +462,8 @@ void ContactsResource::slotItemsRetrieved(KGAPI2::Job *job)
}
QVariantMap map;
- map[QLatin1String("collection")] = QVariant::fromValue(collection);
- map[QLatin1String("modifiedItems")] = QVariant::fromValue(changedPhotos);
+ map[QStringLiteral("collection")] = QVariant::fromValue(collection);
+ map[QStringLiteral("modifiedItems")] = QVariant::fromValue(changedPhotos);
scheduleCustomTask(this, "retrieveContactsPhotos", map);
collection.setRemoteRevision(QString::number(KDateTime::currentUtcDateTime().toTime_t()));
@@ -543,7 +543,7 @@ void ContactsResource::slotCreateJobFinished(KGAPI2::Job *job)
EntityDisplayAttribute *attr = \
collection.attribute<EntityDisplayAttribute>(Entity::AddIfMissing); \
attr->setDisplayName(group->title());
- attr->setIconName(QLatin1String("view-pim-contacts"));
+ attr->setIconName(QStringLiteral("view-pim-contacts"));
m_collections[ collection.remoteId() ] = collection;
diff --git a/resources/google/contacts/settings.cpp \
b/resources/google/contacts/settings.cpp index 0dfde8d..86240d8 100644
--- a/resources/google/contacts/settings.cpp
+++ b/resources/google/contacts/settings.cpp
@@ -45,7 +45,7 @@ Settings::Settings():
s_globalSettings->q = this;
new SettingsAdaptor(this);
- QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"), this,
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this,
QDBusConnection::ExportAdaptors | \
QDBusConnection::ExportScriptableContents); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic