General code cleanup

Fix some clazy warnings, and some other minor code optimisations.

NO_CHANGELOG

1 files changed, 11 insertions, 15 deletions

diff --git a/src/kconfig_compiler/KConfigSourceGenerator.cpp b/src/kconfig_compiler/KConfigSourceGenerator.cpp
index 97db81ba..663a138f 100644
--- a/src/kconfig_compiler/KConfigSourceGenerator.cpp
+++ b/src/kconfig_compiler/KConfigSourceGenerator.cpp
@@ -15,12 +15,8 @@
 
 #include <QRegularExpression>
 
-KConfigSourceGenerator::KConfigSourceGenerator(
-    const QString &inputFile,
-    const QString &baseDir,
-    const KConfigParameters &cfg,
-    ParseResult &result)
-    : KConfigCodeGeneratorBase(inputFile, baseDir, baseDir + cfg.baseName + QLatin1Char('.') + cfg.sourceExtension, cfg, result)
+KConfigSourceGenerator::KConfigSourceGenerator(const QString &inputFile, const QString &baseDir, const KConfigParameters &cfg, ParseResult &parseResult)
+    : KConfigCodeGeneratorBase(inputFile, baseDir, baseDir + cfg.baseName + QLatin1Char('.') + cfg.sourceExtension, cfg, parseResult)
 {
 }
 
@@ -96,7 +92,7 @@ void KConfigSourceGenerator::createPrivateDPointerImplementation()
     stream() << "  public:\n";
 
     // Create Members
-    for (auto *entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         if (entry->group != group) {
             group = entry->group;
             stream() << '\n';
@@ -111,7 +107,7 @@ void KConfigSourceGenerator::createPrivateDPointerImplementation()
     stream() << "\n    // items\n";
 
     // Create Items.
-    for (auto *entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         const QString declType = entry->signalList.isEmpty()
                 ? QString(cfg().inherits + QStringLiteral("::Item") + itemType(entry->type))
                 : QStringLiteral("KConfigCompilerSignallingItem");
@@ -192,7 +188,7 @@ void KConfigSourceGenerator::createSingletonImplementation()
 void KConfigSourceGenerator::createPreamble()
 {
     QString cppPreamble;
-    for (const auto entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         if (entry->paramValues.isEmpty()) {
             continue;
         }
@@ -257,7 +253,7 @@ void KConfigSourceGenerator::createParentConstructorCall()
 
 void KConfigSourceGenerator::createInitializerList()
 {
-    for (const auto &parameter : parseResult.parameters) {
+    for (const auto &parameter : qAsConst(parseResult.parameters)) {
         stream() << "  , mParam" << parameter.name << "(" << parameter.name << ")\n";
     }
 
@@ -480,7 +476,7 @@ void KConfigSourceGenerator::doConstructor()
         stream() << '\n';
     }
 
-    for (auto *entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         handleCurrentGroupChange(entry);
 
         const QString key = paramString(entry->key, parseResult.parameters);
@@ -591,7 +587,7 @@ void KConfigSourceGenerator::doGetterSetterDPointerMode()
     }
 
     // setters and getters go in Cpp if in dpointer mode
-    for (auto *entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         createSetterDPointerMode(entry);
         createGetterDPointerMode(entry);
         createImmutableGetterDPointerMode(entry);
@@ -603,7 +599,7 @@ void KConfigSourceGenerator::doGetterSetterDPointerMode()
 void KConfigSourceGenerator::createDefaultValueGetterSetter()
 {
     // default value getters always go in Cpp
-    for (auto *entry : parseResult.entries) {
+    for (const auto *entry : qAsConst(parseResult.entries)) {
         QString n = entry->name;
         QString t = entry->type;
 
@@ -645,7 +641,7 @@ void KConfigSourceGenerator::createNonModifyingSignalsHelper()
     startScope();
     stream() << "  const bool res = " << cfg().inherits << "::usrSave();\n";
     stream() << "  if (!res) return false;\n\n";
-    for (const Signal &signal : parseResult.signalList) {
+    for (const Signal &signal : qAsConst(parseResult.signalList)) {
         if (signal.modify) {
             continue;
         }
@@ -696,7 +692,7 @@ void KConfigSourceGenerator::createSignalFlagsHandler()
     if (!parseResult.signalList.isEmpty())
         stream() << '\n';
 
-    for (const Signal &signal : parseResult.signalList) {
+    for (const Signal &signal : qAsConst(parseResult.signalList)) {
         if (signal.modify) {
             stream() << "  if ( flags & " << signalEnumName(signal.name) << " ) {\n";
             stream() << "    Q_EMIT " << signal.name << "();\n";