aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2015-10-05 15:16:16 +0200
committerAlbert Astals Cid <aacid@kde.org>2015-10-05 15:16:16 +0200
commit788e2a5509d3072dde1c5243186e70e9dfedf5cc (patch)
treedafc0f730f4eac85a766f2ba653812c5fb377a03 /src/core
parent4ade818d2046f2c91df480386d04674619c1f5ed (diff)
downloadkconfig-788e2a5509d3072dde1c5243186e70e9dfedf5cc.tar.gz
kconfig-788e2a5509d3072dde1c5243186e70e9dfedf5cc.tar.bz2
Minor optimizations
Ran the clazy tool (http://www.kdab.com/use-static-analysis-improve-performance/) Mostly QStringLiteral/QLatin1String additions A few const & additions to non public methods Compiles, test pass REVIEW: 125106
Diffstat (limited to 'src/core')
-rw-r--r--src/core/kauthorized.cpp22
-rw-r--r--src/core/kconfig.cpp16
-rw-r--r--src/core/kconfigbackend.cpp2
-rw-r--r--src/core/kconfigini.cpp4
-rw-r--r--src/core/kcoreconfigskeleton_p.h2
-rw-r--r--src/core/kdesktopfile.cpp14
-rw-r--r--src/core/ksharedconfig.cpp2
7 files changed, 31 insertions, 31 deletions
diff --git a/src/core/kauthorized.cpp b/src/core/kauthorized.cpp
index 4280524d..4de7218c 100644
--- a/src/core/kauthorized.cpp
+++ b/src/core/kauthorized.cpp
@@ -54,7 +54,7 @@ public:
{ b = true; s = s.mid(1); } \
else b = false;
#define checkEqual(s, b) \
- b = (s == QString::fromLatin1("="));
+ b = (s == QLatin1String("="));
URLActionRule(const QByteArray &act,
const QString &bProt, const QString &bHost, const QString &bPath,
@@ -267,39 +267,39 @@ static void initUrlActionRestrictions()
// d->urlActionRestrictions.append(
// URLActionRule("list", Any, Any, Any, "file", Any, QDir::homePath(), true));
d->urlActionRestrictions.append(
- URLActionRule("link", Any, Any, Any, QLatin1String(":internet"), Any, Any, true));
+ URLActionRule("link", Any, Any, Any, QStringLiteral(":internet"), Any, Any, true));
d->urlActionRestrictions.append(
- URLActionRule("redirect", Any, Any, Any, QLatin1String(":internet"), Any, Any, true));
+ URLActionRule("redirect", Any, Any, Any, QStringLiteral(":internet"), Any, Any, true));
// We allow redirections to file: but not from internet protocols, redirecting to file:
// is very popular among io-slaves and we don't want to break them
d->urlActionRestrictions.append(
- URLActionRule("redirect", Any, Any, Any, QLatin1String("file"), Any, Any, true));
+ URLActionRule("redirect", Any, Any, Any, QStringLiteral("file"), Any, Any, true));
d->urlActionRestrictions.append(
- URLActionRule("redirect", QLatin1String(":internet"), Any, Any, QLatin1String("file"), Any, Any, false));
+ URLActionRule("redirect", QStringLiteral(":internet"), Any, Any, QStringLiteral("file"), Any, Any, false));
// local protocols may redirect everywhere
d->urlActionRestrictions.append(
- URLActionRule("redirect", QLatin1String(":local"), Any, Any, Any, Any, Any, true));
+ URLActionRule("redirect", QStringLiteral(":local"), Any, Any, Any, Any, Any, true));
// Anyone may redirect to about:
d->urlActionRestrictions.append(
- URLActionRule("redirect", Any, Any, Any, QLatin1String("about"), Any, Any, true));
+ URLActionRule("redirect", Any, Any, Any, QStringLiteral("about"), Any, Any, true));
// Anyone may redirect to mailto:
d->urlActionRestrictions.append(
- URLActionRule("redirect", Any, Any, Any, QLatin1String("mailto"), Any, Any, true));
+ URLActionRule("redirect", Any, Any, Any, QStringLiteral("mailto"), Any, Any, true));
// Anyone may redirect to itself, cq. within it's own group
d->urlActionRestrictions.append(
- URLActionRule("redirect", Any, Any, Any, QLatin1String("="), Any, Any, true));
+ URLActionRule("redirect", Any, Any, Any, QStringLiteral("="), Any, Any, true));
d->urlActionRestrictions.append(
- URLActionRule("redirect", QLatin1String("about"), Any, Any, Any, Any, Any, true));
+ URLActionRule("redirect", QStringLiteral("about"), Any, Any, Any, Any, Any, true));
KConfigGroup cg(KSharedConfig::openConfig(), "KDE URL Restrictions");
int count = cg.readEntry("rule_count", 0);
- QString keyFormat = QString::fromLatin1("rule_%1");
+ QString keyFormat = QStringLiteral("rule_%1");
for (int i = 1; i <= count; i++) {
QString key = keyFormat.arg(i);
const QStringList rule = cg.readEntry(key, QStringList());
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index 4be9e6d5..7f03869b 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -78,7 +78,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
#ifdef Q_OS_WIN
QFile::decodeName(qgetenv("WINDIR") + "/kde5rc");
#else
- QLatin1String("/etc/kde5rc");
+ QStringLiteral("/etc/kde5rc");
#endif
if (!QFileInfo(etc_kderc).isReadable()) {
etc_kderc.clear();
@@ -498,7 +498,7 @@ void KConfig::checkUpdate(const QString &id, const QString &updateFile)
const QString cfg_id = updateFile + QLatin1Char(':') + id;
const QStringList ids = cg.readEntry("update_info", QStringList());
if (!ids.contains(cfg_id)) {
- QProcess::execute(QStringLiteral(KCONF_UPDATE_INSTALL_LOCATION), QStringList() << QString::fromLatin1("--check") << updateFile);
+ QProcess::execute(QStringLiteral(KCONF_UPDATE_INSTALL_LOCATION), QStringList() << QStringLiteral("--check") << updateFile);
reparseConfiguration();
}
}
@@ -583,7 +583,7 @@ void KConfigPrivate::changeFileName(const QString &name)
file = QStandardPaths::writableLocation(resourceType) + QLatin1Char('/') + fileName;
} else if (wantGlobals()) { // accessing "kdeglobals" by specifying no filename and NoCascade - XXX used anywhere?
resourceType = QStandardPaths::GenericConfigLocation;
- fileName = QLatin1String("kdeglobals");
+ fileName = QStringLiteral("kdeglobals");
file = sGlobalFileName;
} else {
// anonymous config
@@ -650,8 +650,8 @@ QStringList KConfigPrivate::getGlobalFiles() const
{
QMutexLocker locker(&s_globalFilesMutex);
if (s_globalFiles()->isEmpty()) {
- const QStringList paths1 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QLatin1String("kdeglobals"));
- const QStringList paths2 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QLatin1String("system.kdeglobals"));
+ const QStringList paths1 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("kdeglobals"));
+ const QStringList paths2 = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("system.kdeglobals"));
const bool useEtcKderc = !etc_kderc.isEmpty();
s_globalFiles()->reserve(paths1.size() + paths2.size() + (useEtcKderc ? 1 : 0));
@@ -901,11 +901,11 @@ bool KConfig::isConfigWritable(bool warnUser)
// Note: We don't ask the user if we should not ask this question again because we can't save the answer.
errorMsg += QCoreApplication::translate("KConfig", "Please contact your system administrator.");
- QString cmdToExec = QStandardPaths::findExecutable(QString::fromLatin1("kdialog"));
+ QString cmdToExec = QStandardPaths::findExecutable(QStringLiteral("kdialog"));
if (!cmdToExec.isEmpty()) {
QProcess::execute(cmdToExec, QStringList()
- << QString::fromLatin1("--title") << QCoreApplication::applicationName()
- << QString::fromLatin1("--msgbox") << errorMsg);
+ << QStringLiteral("--title") << QCoreApplication::applicationName()
+ << QStringLiteral("--msgbox") << errorMsg);
}
}
diff --git a/src/core/kconfigbackend.cpp b/src/core/kconfigbackend.cpp
index 67bdefa4..16bcf0fe 100644
--- a/src/core/kconfigbackend.cpp
+++ b/src/core/kconfigbackend.cpp
@@ -44,7 +44,7 @@ public:
static QString whatSystem(const QString & /*fileName*/)
{
- return QLatin1String("INI");
+ return QStringLiteral("INI");
}
};
diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp
index 856b7b76..83a6c3cf 100644
--- a/src/core/kconfigini.cpp
+++ b/src/core/kconfigini.cpp
@@ -55,7 +55,7 @@ static QByteArray lookup(const KConfigIniBackend::BufferFragment &fragment, QHas
QString KConfigIniBackend::warningProlog(const QFile &file, int line)
{
- return QString::fromLatin1("KConfigIni: In file %2, line %1: ")
+ return QStringLiteral("KConfigIni: In file %2, line %1: ")
.arg(line).arg(file.fileName());
}
@@ -810,7 +810,7 @@ void KConfigIniBackend::printableToString(BufferFragment *aString, const QFile &
default:
*r = '\\';
qWarning() << warningProlog(file, line)
- << QString::fromLatin1("Invalid escape sequence \"\\%1\".").arg(str[i]);
+ << QStringLiteral("Invalid escape sequence \"\\%1\".").arg(str[i]);
}
}
}
diff --git a/src/core/kcoreconfigskeleton_p.h b/src/core/kcoreconfigskeleton_p.h
index d098ef66..88a41d8d 100644
--- a/src/core/kcoreconfigskeleton_p.h
+++ b/src/core/kcoreconfigskeleton_p.h
@@ -28,7 +28,7 @@ class KCoreConfigSkeletonPrivate
{
public:
KCoreConfigSkeletonPrivate()
- : mCurrentGroup(QLatin1String("No Group")), mUseDefaults(false)
+ : mCurrentGroup(QStringLiteral("No Group")), mUseDefaults(false)
{}
~KCoreConfigSkeletonPrivate()
{
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index 49f37c36..eda7c292 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
return true;
}
}
- const QString servicesDir = QLatin1String("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services")
+ const QString servicesDir = QStringLiteral("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services")
Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
if (QDir(xdgDataPrefix).exists()) {
const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
@@ -142,7 +142,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
}
}
}
- const QString autostartDir = QLatin1String("autostart/");
+ const QString autostartDir = QStringLiteral("autostart/");
Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
if (QDir(xdgDataPrefix).exists()) {
const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
@@ -153,7 +153,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
}
// Forbid desktop files outside of standard locations if kiosk is set so
- if (!KAuthorized::authorize(QLatin1String("run_desktop_files"))) {
+ if (!KAuthorized::authorize(QStringLiteral("run_desktop_files"))) {
qWarning() << "Access to '" << path << "' denied because of 'run_desktop_files' restriction." << endl;
return false;
}
@@ -302,9 +302,9 @@ bool KDesktopFile::tryExec() const
user = QString::fromLocal8Bit(qgetenv("ADMIN_ACCOUNT"));
}
if (user.isEmpty()) {
- user = QString::fromLatin1("root");
+ user = QStringLiteral("root");
}
- if (!KAuthorized::authorize(QString::fromLatin1("user/") + user)) {
+ if (!KAuthorized::authorize(QLatin1String("user/") + user)) {
return false;
}
}
@@ -365,12 +365,12 @@ bool KDesktopFile::noDisplay() const
return true;
}
if (d->desktopGroup.hasKey("OnlyShowIn")) {
- if (!d->desktopGroup.readXdgListEntry("OnlyShowIn").contains(QLatin1String("KDE"))) {
+ if (!d->desktopGroup.readXdgListEntry("OnlyShowIn").contains(QStringLiteral("KDE"))) {
return true;
}
}
if (d->desktopGroup.hasKey("NotShowIn")) {
- if (d->desktopGroup.readXdgListEntry("NotShowIn").contains(QLatin1String("KDE"))) {
+ if (d->desktopGroup.readXdgListEntry("NotShowIn").contains(QStringLiteral("KDE"))) {
return true;
}
}
diff --git a/src/core/ksharedconfig.cpp b/src/core/ksharedconfig.cpp
index e059b87a..8eb1308f 100644
--- a/src/core/ksharedconfig.cpp
+++ b/src/core/ksharedconfig.cpp
@@ -111,7 +111,7 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString &_fileName,
userWarned = true;
QByteArray readOnly = qgetenv("KDE_HOME_READONLY");
if (readOnly.isEmpty() && QCoreApplication::applicationName() != QLatin1String("kdialog")) {
- if (ptr->group("General").readEntry(QLatin1String("warn_unwritable_config"), true)) {
+ if (ptr->group("General").readEntry(QStringLiteral("warn_unwritable_config"), true)) {
ptr->isConfigWritable(true);
}
}