diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/kconfig.cpp | 2 | ||||
| -rw-r--r-- | src/core/kconfigwatcher.cpp | 4 | ||||
| -rw-r--r-- | src/core/kemailsettings.cpp | 9 | ||||
| -rw-r--r-- | src/kconf_update/kconf_update.cpp | 2 | 
4 files changed, 8 insertions, 9 deletions
| diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index c45643d2..67c0b469 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -468,7 +468,7 @@ bool KConfig::sync()      }      if (!notifyGroupsLocal.isEmpty()) { -        d->notifyClients(notifyGroupsLocal, QStringLiteral("/") + name()); +        d->notifyClients(notifyGroupsLocal, QLatin1Char('/') + name());      }      if (!notifyGroupsGlobal.isEmpty()) {          d->notifyClients(notifyGroupsGlobal, QStringLiteral("/kdeglobals")); diff --git a/src/core/kconfigwatcher.cpp b/src/core/kconfigwatcher.cpp index c9c500aa..1aec1211 100644 --- a/src/core/kconfigwatcher.cpp +++ b/src/core/kconfigwatcher.cpp @@ -69,9 +69,9 @@ KConfigWatcher::KConfigWatcher(const KSharedConfig::Ptr &config):      d->m_config = config;      QStringList watchedPaths; -    watchedPaths <<QStringLiteral("/") + d->m_config->name(); +    watchedPaths << QLatin1Char('/') + d->m_config->name();      for (const QString file: d->m_config->additionalConfigSources()) { -        watchedPaths << QStringLiteral("/") + file; +        watchedPaths << QLatin1Char('/') + file;      }      if (d->m_config->openFlags() & KConfig::IncludeGlobals) {          watchedPaths << QStringLiteral("/kdeglobals"); diff --git a/src/core/kemailsettings.cpp b/src/core/kemailsettings.cpp index a16e6839..0d4028df 100644 --- a/src/core/kemailsettings.cpp +++ b/src/core/kemailsettings.cpp @@ -49,7 +49,7 @@ QString KEMailSettings::defaultProfileName() const  QString KEMailSettings::getSetting(KEMailSettings::Setting s) const  { -    KConfigGroup cg(p->m_pConfig, QStringLiteral("PROFILE_") + p->m_sCurrentProfile); +    KConfigGroup cg(p->m_pConfig, QLatin1String("PROFILE_") + p->m_sCurrentProfile);      switch (s) {      case ClientProgram: {          return cg.readEntry("EmailClient"); @@ -110,7 +110,7 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const  }  void KEMailSettings::setSetting(KEMailSettings::Setting s, const QString  &v)  { -    KConfigGroup cg(p->m_pConfig, QStringLiteral("PROFILE_") + p->m_sCurrentProfile); +    KConfigGroup cg(p->m_pConfig, QLatin1String("PROFILE_") + p->m_sCurrentProfile);      switch (s) {      case ClientProgram: {          cg.writePathEntry("EmailClient", v); @@ -198,8 +198,7 @@ void KEMailSettings::setDefault(const QString &s)  void KEMailSettings::setProfile(const QString &s)  { -    QString groupname = QStringLiteral("PROFILE_"); -    groupname.append(s); +    const QString groupname = QLatin1String("PROFILE_") + s;      p->m_sCurrentProfile = s;      if (!p->m_pConfig->hasGroup(groupname)) { // Create a group if it doesn't exist          KConfigGroup cg(p->m_pConfig, groupname); @@ -237,7 +236,7 @@ KEMailSettings::KEMailSettings()      KConfigGroup cg(p->m_pConfig, "Defaults");      p->m_sDefaultProfile = cg.readEntry("Profile", tr("Default"));      if (!p->m_sDefaultProfile.isNull()) { -        if (!p->m_pConfig->hasGroup(QStringLiteral("PROFILE_") + p->m_sDefaultProfile)) { +        if (!p->m_pConfig->hasGroup(QLatin1String("PROFILE_") + p->m_sDefaultProfile)) {              setDefault(tr("Default"));          } else {              setDefault(p->m_sDefaultProfile); diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp index f6c7653d..09537e2f 100644 --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -751,7 +751,7 @@ void KonfUpdate::gotScript(const QString &_script)          return;      } -    QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update/") + script); +    QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("kconf_update/") + script);      if (path.isEmpty()) {          if (interpreter.isEmpty()) {              path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + script; | 
