aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/kconfig.cpp6
-rw-r--r--src/core/kconfiggroup.cpp3
-rw-r--r--src/core/kconfigini.cpp5
-rw-r--r--src/core/kcoreconfigskeleton.cpp3
-rw-r--r--src/kconf_update/kconf_update.cpp3
-rw-r--r--src/kconfig_compiler/KConfigHeaderGenerator.cpp5
-rw-r--r--src/kconfig_compiler/KConfigSourceGenerator.cpp6
-rw-r--r--src/kconfig_compiler/KConfigXmlParser.cpp8
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp6
-rw-r--r--src/kreadconfig/kreadconfig.cpp16
-rw-r--r--src/kreadconfig/kwriteconfig.cpp5
11 files changed, 41 insertions, 25 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index b4777575..b5fd9d63 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -580,8 +580,9 @@ void KConfig::setMainConfigName(const QString &str)
QString KConfig::mainConfigName()
{
KConfigStaticData *data = globalData();
- if (data->appArgs.isEmpty())
+ if (data->appArgs.isEmpty()) {
data->appArgs = QCoreApplication::arguments();
+ }
// --config on the command line overrides everything else
const QStringList args = data->appArgs;
@@ -722,8 +723,9 @@ void KConfigPrivate::parseGlobalFiles()
for (const QString &file : globalFiles) {
KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal | KConfigBackend::ParseExpansions;
- if (file.compare(*sGlobalFileName, sPathCaseSensitivity) != 0)
+ if (file.compare(*sGlobalFileName, sPathCaseSensitivity) != 0) {
parseOpts |= KConfigBackend::ParseDefaults;
+ }
QExplicitlySharedDataPointer<KConfigBackend> backend = KConfigBackend::create(file);
if (backend->parseConfig(utf8Locale, entryMap, parseOpts) == KConfigBackend::ParseImmutable) {
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp
index 5ee9f6ab..a15c45eb 100644
--- a/src/core/kconfiggroup.cpp
+++ b/src/core/kconfiggroup.cpp
@@ -935,10 +935,11 @@ void KConfigGroup::writeEntry(const char *key, const QVariant &value, WriteConfi
data = value.toString().toUtf8();
break;
case QMetaType::QVariantList:
- if (!value.canConvert(QMetaType::QStringList))
+ if (!value.canConvert(QMetaType::QStringList)) {
qCWarning(KCONFIG_CORE_LOG) << "not all types in \"" << key
<< "\" can convert to QString,"
" information will be lost";
+ }
Q_FALLTHROUGH();
case QMetaType::QStringList:
writeEntry(key, value.toList(), flags);
diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp
index 2792cb4f..5bc8743c 100644
--- a/src/core/kconfigini.cpp
+++ b/src/core/kconfigini.cpp
@@ -592,10 +592,11 @@ void KConfigIniBackend::setFilePath(const QString &file)
setLocalFilePath(info.canonicalFilePath());
} else {
const QString dir = info.dir().canonicalPath();
- if (!dir.isEmpty())
+ if (!dir.isEmpty()) {
setLocalFilePath(dir + QLatin1Char('/') + info.fileName());
- else
+ } else {
setLocalFilePath(file);
+ }
}
}
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp
index ab968023..e1c5c1dd 100644
--- a/src/core/kcoreconfigskeleton.cpp
+++ b/src/core/kcoreconfigskeleton.cpp
@@ -17,10 +17,11 @@ static QString obscuredString(const QString &str)
{
QString result;
const QChar *unicode = str.unicode();
- for (int i = 0; i < str.length(); ++i)
+ for (int i = 0; i < str.length(); ++i) {
// yes, no typo. can't encode ' ' or '!' because
// they're the unicode BOM. stupid scrambling. stupid.
result += (unicode[i].unicode() <= 0x21) ? unicode[i] : QChar(0x1001F - unicode[i].unicode());
+ }
return result;
}
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index d4f7e15e..bfb115dd 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -575,7 +575,8 @@ void KonfUpdate::gotRemoveGroup(const QString &_group)
void KonfUpdate::gotKey(const QString &_key)
{
- QString oldKey, newKey;
+ QString oldKey;
+ QString newKey;
const int i = _key.indexOf(QLatin1Char{','});
if (i == -1) {
oldKey = _key.trimmed();
diff --git a/src/kconfig_compiler/KConfigHeaderGenerator.cpp b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
index bf29da05..24829ff5 100644
--- a/src/kconfig_compiler/KConfigHeaderGenerator.cpp
+++ b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
@@ -319,10 +319,11 @@ void KConfigHeaderGenerator::createConstructor()
stream() << whitespace() << "" << cfg().className << "(";
if (parseResult.cfgFileNameArg) {
- if (cfg().forceStringFilename)
+ if (cfg().forceStringFilename) {
stream() << " const QString &cfgfilename" << (parseResult.parameters.isEmpty() ? " = QString()" : ", ");
- else
+ } else {
stream() << " KSharedConfig::Ptr config" << (parseResult.parameters.isEmpty() ? " = KSharedConfig::openConfig()" : ", ");
+ }
}
bool first = true;
diff --git a/src/kconfig_compiler/KConfigSourceGenerator.cpp b/src/kconfig_compiler/KConfigSourceGenerator.cpp
index d308ffcd..e221d1ab 100644
--- a/src/kconfig_compiler/KConfigSourceGenerator.cpp
+++ b/src/kconfig_compiler/KConfigSourceGenerator.cpp
@@ -674,11 +674,13 @@ void KConfigSourceGenerator::createSignalFlagsHandler()
stream() << '\n';
stream() << "void " << cfg().className << "::"
<< "itemChanged(quint64 flags) {\n";
- if (parseResult.hasNonModifySignals)
+ if (parseResult.hasNonModifySignals) {
stream() << " " << varPath(QStringLiteral("settingsChanged"), cfg()) << " |= flags;\n";
+ }
- if (!parseResult.signalList.isEmpty())
+ if (!parseResult.signalList.isEmpty()) {
stream() << '\n';
+ }
for (const Signal &signal : qAsConst(parseResult.signalList)) {
if (signal.modify) {
diff --git a/src/kconfig_compiler/KConfigXmlParser.cpp b/src/kconfig_compiler/KConfigXmlParser.cpp
index 5b2fb775..3d054522 100644
--- a/src/kconfig_compiler/KConfigXmlParser.cpp
+++ b/src/kconfig_compiler/KConfigXmlParser.cpp
@@ -371,24 +371,24 @@ CfgEntry *KConfigXmlParser::parseEntry(const QString &group, const QString &pare
readParamDefaultValues(readEntry, element);
if (!mValidNameRegexp.match(readEntry.name).hasMatch()) {
- if (nameIsEmpty)
+ if (nameIsEmpty) {
std::cerr << "The key '" << qPrintable(readEntry.key)
<< "' can not be used as name for the entry because "
"it is not a valid name. You need to specify a valid name for this entry."
<< std::endl;
- else {
+ } else {
std::cerr << "The name '" << qPrintable(readEntry.name) << "' is not a valid name for an entry." << std::endl;
}
exit(1);
}
if (mAllNames.contains(readEntry.name)) {
- if (nameIsEmpty)
+ if (nameIsEmpty) {
std::cerr << "The key '" << qPrintable(readEntry.key)
<< "' can not be used as name for the entry because "
"it does not result in a unique name. You need to specify a unique name for this entry."
<< std::endl;
- else {
+ } else {
std::cerr << "The name '" << qPrintable(readEntry.name) << "' is not unique." << std::endl;
}
exit(1);
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 28b10e4f..761e64fc 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -645,10 +645,11 @@ QString indent(QString text, int spaces)
QString currLine;
while (!in.atEnd()) {
currLine = in.readLine();
- if (!currLine.isEmpty())
+ if (!currLine.isEmpty()) {
for (int i = 0; i < spaces; ++i) {
out << " ";
}
+ }
out << currLine << '\n';
}
return result;
@@ -700,7 +701,8 @@ int main(int argc, char **argv)
app.setApplicationName(QStringLiteral("kconfig_compiler"));
app.setApplicationVersion(QStringLiteral(KCONFIG_VERSION_STRING));
- QString inputFilename, codegenFilename;
+ QString inputFilename;
+ QString codegenFilename;
QCommandLineOption targetDirectoryOption(QStringList{QStringLiteral("d"), QStringLiteral("directory")},
QCoreApplication::translate("main", "Directory to generate files in [.]"),
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp
index f0fb3518..01d44326 100644
--- a/src/kreadconfig/kreadconfig.cpp
+++ b/src/kreadconfig/kreadconfig.cpp
@@ -67,9 +67,9 @@ int main(int argc, char **argv)
KConfig *konfig;
bool configMustDeleted = false;
- if (file.isEmpty())
+ if (file.isEmpty()) {
konfig = KSharedConfig::openConfig().data();
- else {
+ } else {
konfig = new KConfig(file, KConfig::NoGlobals);
configMustDeleted = true;
}
@@ -82,24 +82,28 @@ int main(int argc, char **argv)
dflt = dflt.toLower();
bool def = (dflt == QLatin1String{"true"} || dflt == QLatin1String{"on"} || dflt == QLatin1String{"yes"} || dflt == QLatin1String{"1"});
bool retValue = !cfgGroup.readEntry(key, def);
- if (configMustDeleted)
+ if (configMustDeleted) {
delete konfig;
+ }
return retValue;
} else if (type == QLatin1String{"num"} || type == QLatin1String{"int"}) {
int retValue = cfgGroup.readEntry(key, dflt.toInt());
- if (configMustDeleted)
+ if (configMustDeleted) {
delete konfig;
+ }
return retValue;
} else if (type == QLatin1String{"path"}) {
fprintf(stdout, "%s\n", cfgGroup.readPathEntry(key, dflt).toLocal8Bit().data());
- if (configMustDeleted)
+ if (configMustDeleted) {
delete konfig;
+ }
return 0;
} else {
/* Assume it's a string... */
fprintf(stdout, "%s\n", cfgGroup.readEntry(key, dflt).toLocal8Bit().data());
- if (configMustDeleted)
+ if (configMustDeleted) {
delete konfig;
+ }
return 0;
}
}
diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp
index 67d9637e..20036331 100644
--- a/src/kreadconfig/kwriteconfig.cpp
+++ b/src/kreadconfig/kwriteconfig.cpp
@@ -53,10 +53,11 @@ int main(int argc, char **argv)
}
KConfig *konfig;
- if (file.isEmpty())
+ if (file.isEmpty()) {
konfig = new KConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
- else
+ } else {
konfig = new KConfig(file, KConfig::NoGlobals);
+ }
KConfigGroup cfgGroup = konfig->group(QString());
for (const QString &grp : groups) {
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-04 15:14:49 +0000