diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-22 17:38:09 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-22 17:38:09 +0200 |
commit | 8bed00ab34e31f2b9c70026d418d923913325798 (patch) | |
tree | f289c15575415a36bc19c047a2037998e9b11ce8 /src/kreadconfig | |
parent | 186755fd56b58dc97250846c5305ef89f9487f86 (diff) | |
download | kconfig-8bed00ab34e31f2b9c70026d418d923913325798.tar.gz kconfig-8bed00ab34e31f2b9c70026d418d923913325798.tar.bz2 |
Run clang-format on all cpp/h files
NO_CHANGELOG
Diffstat (limited to 'src/kreadconfig')
-rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 100 | ||||
-rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 51 |
2 files changed, 80 insertions, 71 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index 3d26c3b8..444f3bde 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -38,64 +38,66 @@ int main(int argc, char **argv) { - QCoreApplication app(argc, argv); + QCoreApplication app(argc, argv); - QCommandLineParser parser; - parser.addOption(QCommandLineOption(QStringLiteral("file"), QCoreApplication::translate("main", "Use <file> instead of global config"), QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringLiteral("group"), QCoreApplication::translate("main", "Group to look in. Use repeatedly for nested groups."), QStringLiteral("group"), QStringLiteral("KDE"))); + QCommandLineParser parser; + parser.addOption( + QCommandLineOption(QStringLiteral("file"), QCoreApplication::translate("main", "Use <file> instead of global config"), QStringLiteral("file"))); + parser.addOption(QCommandLineOption(QStringLiteral("group"), + QCoreApplication::translate("main", "Group to look in. Use repeatedly for nested groups."), + QStringLiteral("group"), + QStringLiteral("KDE"))); parser.addOption(QCommandLineOption(QStringLiteral("key"), QCoreApplication::translate("main", "Key to look for"), QStringLiteral("key"))); parser.addOption(QCommandLineOption(QStringLiteral("default"), QCoreApplication::translate("main", "Default value"), QStringLiteral("value"))); parser.addOption(QCommandLineOption(QStringLiteral("type"), QCoreApplication::translate("main", "Type of variable"), QStringLiteral("type"))); - parser.process(app); + parser.process(app); - const QStringList groups=parser.values(QStringLiteral("group")); - QString key=parser.value(QStringLiteral("key")); - QString file=parser.value(QStringLiteral("file")); - QString dflt=parser.value(QStringLiteral("default")); - QString type=parser.value(QStringLiteral("type")).toLower(); + const QStringList groups = parser.values(QStringLiteral("group")); + QString key = parser.value(QStringLiteral("key")); + QString file = parser.value(QStringLiteral("file")); + QString dflt = parser.value(QStringLiteral("default")); + QString type = parser.value(QStringLiteral("type")).toLower(); if (key.isNull() || !parser.positionalArguments().isEmpty()) { - parser.showHelp(1); - } + parser.showHelp(1); + } - KSharedConfig::openConfig(); + KSharedConfig::openConfig(); - KConfig *konfig; - bool configMustDeleted = false; - if (file.isEmpty()) - konfig = KSharedConfig::openConfig().data(); - else - { - konfig = new KConfig( file, KConfig::NoGlobals ); - configMustDeleted=true; - } - KConfigGroup cfgGroup = konfig->group(QString()); + KConfig *konfig; + bool configMustDeleted = false; + if (file.isEmpty()) + konfig = KSharedConfig::openConfig().data(); + else { + konfig = new KConfig(file, KConfig::NoGlobals); + configMustDeleted = true; + } + KConfigGroup cfgGroup = konfig->group(QString()); for (const QString &grp : groups) - cfgGroup = cfgGroup.group(grp); - if(type==QStringLiteral("bool")) { - dflt=dflt.toLower(); - bool def=(dflt==QStringLiteral("true") || dflt==QStringLiteral("on") || dflt==QStringLiteral("yes") || dflt==QStringLiteral("1")); - bool retValue = !cfgGroup.readEntry(key, def); - if ( configMustDeleted ) - delete konfig; - return retValue; - } else if((type==QStringLiteral("num")) || (type==QStringLiteral("int"))) { - int retValue = cfgGroup.readEntry(key, dflt.toInt()); - if ( configMustDeleted ) - delete konfig; - return retValue; - } else if (type==QStringLiteral("path")){ - fprintf(stdout, "%s\n", cfgGroup.readPathEntry(key, dflt).toLocal8Bit().data()); - if ( configMustDeleted ) - delete konfig; - return 0; - } else { - /* Assume it's a string... */ - fprintf(stdout, "%s\n", cfgGroup.readEntry(key, dflt).toLocal8Bit().data()); - if ( configMustDeleted ) - delete konfig; - return 0; - } + cfgGroup = cfgGroup.group(grp); + if (type == QStringLiteral("bool")) { + dflt = dflt.toLower(); + bool def = (dflt == QStringLiteral("true") || dflt == QStringLiteral("on") || dflt == QStringLiteral("yes") || dflt == QStringLiteral("1")); + bool retValue = !cfgGroup.readEntry(key, def); + if (configMustDeleted) + delete konfig; + return retValue; + } else if ((type == QStringLiteral("num")) || (type == QStringLiteral("int"))) { + int retValue = cfgGroup.readEntry(key, dflt.toInt()); + if (configMustDeleted) + delete konfig; + return retValue; + } else if (type == QStringLiteral("path")) { + fprintf(stdout, "%s\n", cfgGroup.readPathEntry(key, dflt).toLocal8Bit().data()); + if (configMustDeleted) + delete konfig; + return 0; + } else { + /* Assume it's a string... */ + fprintf(stdout, "%s\n", cfgGroup.readEntry(key, dflt).toLocal8Bit().data()); + if (configMustDeleted) + delete konfig; + return 0; + } } - diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp index 8befa56d..ba16ec68 100644 --- a/src/kreadconfig/kwriteconfig.cpp +++ b/src/kreadconfig/kwriteconfig.cpp @@ -11,9 +11,9 @@ #include <KConfig> #include <KConfigGroup> -#include <stdio.h> -#include <QCoreApplication> #include <QCommandLineParser> +#include <QCoreApplication> +#include <stdio.h> int main(int argc, char **argv) { @@ -21,20 +21,27 @@ int main(int argc, char **argv) QCommandLineParser parser; parser.addHelpOption(); - parser.addOption(QCommandLineOption(QStringLiteral("file"), QCoreApplication::translate("main", "Use <file> instead of global config"), QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringLiteral("group"), QCoreApplication::translate("main", "Group to look in. Use repeatedly for nested groups."), QStringLiteral("group"), QStringLiteral("KDE"))); + parser.addOption( + QCommandLineOption(QStringLiteral("file"), QCoreApplication::translate("main", "Use <file> instead of global config"), QStringLiteral("file"))); + parser.addOption(QCommandLineOption(QStringLiteral("group"), + QCoreApplication::translate("main", "Group to look in. Use repeatedly for nested groups."), + QStringLiteral("group"), + QStringLiteral("KDE"))); parser.addOption(QCommandLineOption(QStringLiteral("key"), QCoreApplication::translate("main", "Key to look for"), QStringLiteral("key"))); - parser.addOption(QCommandLineOption(QStringLiteral("type"), QCoreApplication::translate("main", "Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string"), QStringLiteral("type"))); + parser.addOption( + QCommandLineOption(QStringLiteral("type"), + QCoreApplication::translate("main", "Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string"), + QStringLiteral("type"))); parser.addOption(QCommandLineOption(QStringLiteral("delete"), QCoreApplication::translate("main", "Delete the designated key if enabled"))); - parser.addPositionalArgument(QStringLiteral("value"), QCoreApplication::translate("main", "The value to write. Mandatory, on a shell use '' for empty" )); + parser.addPositionalArgument(QStringLiteral("value"), QCoreApplication::translate("main", "The value to write. Mandatory, on a shell use '' for empty")); parser.process(app); - const QStringList groups=parser.values(QStringLiteral("group")); - QString key=parser.value(QStringLiteral("key")); - QString file=parser.value(QStringLiteral("file")); - QString type=parser.value(QStringLiteral("type")).toLower(); - bool del=parser.isSet(QStringLiteral("delete")); + const QStringList groups = parser.values(QStringLiteral("group")); + QString key = parser.value(QStringLiteral("key")); + QString file = parser.value(QStringLiteral("file")); + QString type = parser.value(QStringLiteral("type")).toLower(); + bool del = parser.isSet(QStringLiteral("delete")); QString value; if (del) { @@ -47,28 +54,28 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(QStringLiteral( "kdeglobals"), KConfig::NoGlobals ); + konfig = new KConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals); else - konfig = new KConfig( file, KConfig::NoGlobals ); + konfig = new KConfig(file, KConfig::NoGlobals); KConfigGroup cfgGroup = konfig->group(QString()); for (const QString &grp : groups) cfgGroup = cfgGroup.group(grp); - if ( konfig->accessMode() != KConfig::ReadWrite || cfgGroup.isEntryImmutable( key ) ) return 2; + if (konfig->accessMode() != KConfig::ReadWrite || cfgGroup.isEntryImmutable(key)) + return 2; if (del) { - cfgGroup.deleteEntry( key ); - } else if (type==QStringLiteral("bool")) { + cfgGroup.deleteEntry(key); + } else if (type == QStringLiteral("bool")) { // For symmetry with kreadconfig we accept a wider range of values as true than Qt - bool boolvalue=(value==QStringLiteral("true") || value==QStringLiteral("on") || value==QStringLiteral("yes") || value==QStringLiteral("1")); - cfgGroup.writeEntry( key, boolvalue ); - } else if (type==QStringLiteral("path")) { - cfgGroup.writePathEntry( key, value ); + bool boolvalue = (value == QStringLiteral("true") || value == QStringLiteral("on") || value == QStringLiteral("yes") || value == QStringLiteral("1")); + cfgGroup.writeEntry(key, boolvalue); + } else if (type == QStringLiteral("path")) { + cfgGroup.writePathEntry(key, value); } else { - cfgGroup.writeEntry( key, value ); + cfgGroup.writeEntry(key, value); } konfig->sync(); delete konfig; return 0; } - |