diff options
| -rw-r--r-- | src/kconfig_compiler/KConfigHeaderGenerator.cpp | 20 | ||||
| -rw-r--r-- | src/kconfig_compiler/KConfigSourceGenerator.cpp | 14 |
2 files changed, 24 insertions, 10 deletions
diff --git a/src/kconfig_compiler/KConfigHeaderGenerator.cpp b/src/kconfig_compiler/KConfigHeaderGenerator.cpp index 47f5358e..5b828ec8 100644 --- a/src/kconfig_compiler/KConfigHeaderGenerator.cpp +++ b/src/kconfig_compiler/KConfigHeaderGenerator.cpp @@ -255,7 +255,14 @@ void KConfigHeaderGenerator::createSignals() // a last comma, as it's valid c++. for (int i = 0, end = parseResult.signalList.size(); i < end; i++) { auto signal = parseResult.signalList.at(i); - stream() << whitespace() << " " << signalEnumName(signal.name) << " = 0x" << hex << val; + stream() << whitespace() << " " << signalEnumName(signal.name) << " = 0x" + << + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + hex + #else + Qt::hex + #endif + << val; if (i != end-1) { stream() << ",\n"; } @@ -263,7 +270,14 @@ void KConfigHeaderGenerator::createSignals() val <<= 1; } stream() << '\n'; - stream() << whitespace() << "};" << dec << "\n\n"; + stream() << whitespace() << "};" + << + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + dec + #else + Qt::dec + #endif + << "\n\n"; stream() << " Q_SIGNALS:"; for (const Signal &signal : parseResult.signalList) { @@ -495,7 +509,7 @@ void KConfigHeaderGenerator::createItemAcessors(const CfgEntry *entry, const QSt stream() << ";\n"; } - stream() <<endl; + stream() << '\n'; } void KConfigHeaderGenerator::createDefaultValueMember(const CfgEntry *entry) diff --git a/src/kconfig_compiler/KConfigSourceGenerator.cpp b/src/kconfig_compiler/KConfigSourceGenerator.cpp index 8a4b921f..87d00960 100644 --- a/src/kconfig_compiler/KConfigSourceGenerator.cpp +++ b/src/kconfig_compiler/KConfigSourceGenerator.cpp @@ -44,7 +44,7 @@ void KConfigSourceGenerator::start() if (!cfg().nameSpace.isEmpty()) { stream() << "using namespace " << cfg().nameSpace << ";"; - stream() << endl << '\n'; + stream() << "\n\n"; } createPrivateDPointerImplementation(); @@ -120,7 +120,7 @@ void KConfigSourceGenerator::createPrivateDPointerImplementation() } stream() << ";\n"; } - stream() << endl << " // items\n"; + stream() << "\n // items\n"; // Create Items. for (auto *entry : parseResult.entries) { @@ -139,7 +139,7 @@ void KConfigSourceGenerator::createPrivateDPointerImplementation() stream() << " uint " << varName(QStringLiteral("settingsChanged"), cfg()) << ";\n"; } - stream() << "};" << endl << '\n'; + stream() << "};\n\n"; endNamespaces(); } @@ -173,10 +173,10 @@ void KConfigSourceGenerator::createSingletonImplementation() stream() << " if (!s_global" << cfg().className << "()->q) {\n"; stream() << " new " << cfg().className << ';' << '\n'; stream() << " s_global" << cfg().className << "()->q->read();\n"; - stream() << " }" << endl << '\n'; + stream() << " }\n\n"; } stream() << " return s_global" << cfg().className << "()->q;\n"; - stream() << "}" << endl << '\n'; + stream() << "}\n\n"; if (parseResult.cfgFileNameArg) { auto instance = [this] (const QString &type, const QString &arg, bool isString) { @@ -194,7 +194,7 @@ void KConfigSourceGenerator::createSingletonImplementation() } stream() << ");\n"; stream() << " s_global" << cfg().className << "()->q->read();\n"; - stream() << "}" << endl << '\n'; + stream() << "}\n\n"; }; instance(QStringLiteral("const QString&"), QStringLiteral("cfgfilename"), true); instance(QStringLiteral("KSharedConfig::Ptr"), QStringLiteral("config"), false); @@ -388,7 +388,7 @@ void KConfigSourceGenerator::handleCurrentGroupChange(const CfgEntry *entry) mCurrentGroup = entry->group; stream() << " setCurrentGroup( " << paramString(mCurrentGroup, parseResult.parameters) << " );"; - stream() << endl << '\n'; + stream() << "\n\n"; } void KConfigSourceGenerator::doConstructor() |