diff options
| -rw-r--r-- | autotests/kconfig_compiler/test8a.cpp.ref | 2 | ||||
| -rw-r--r-- | autotests/kconfig_compiler/test8c.cpp.ref | 4 | ||||
| -rw-r--r-- | src/kconfig_compiler/kconfig_compiler.cpp | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/autotests/kconfig_compiler/test8a.cpp.ref b/autotests/kconfig_compiler/test8a.cpp.ref index 7c2b81ad..3cb835ee 100644 --- a/autotests/kconfig_compiler/test8a.cpp.ref +++ b/autotests/kconfig_compiler/test8a.cpp.ref @@ -4,7 +4,7 @@ #include "test8a.h" Test8a::Test8a( KSharedConfig::Ptr config, QObject *parent ) - : KConfigSkeleton( config ) + : KConfigSkeleton( std::move( config ) ) { setParent(parent); setCurrentGroup( QStringLiteral( "Group" ) ); diff --git a/autotests/kconfig_compiler/test8c.cpp.ref b/autotests/kconfig_compiler/test8c.cpp.ref index e2bd027c..d806ca79 100644 --- a/autotests/kconfig_compiler/test8c.cpp.ref +++ b/autotests/kconfig_compiler/test8c.cpp.ref @@ -41,12 +41,12 @@ void Test8c::instance(KSharedConfig::Ptr config) qDebug() << "Test8c::instance called after the first use - ignoring"; return; } - new Test8c(config); + new Test8c(std::move(config)); s_globalTest8c()->q->read(); } Test8c::Test8c( KSharedConfig::Ptr config, QObject *parent ) - : KConfigSkeleton( config ) + : KConfigSkeleton( std::move( config ) ) { setParent(parent); Q_ASSERT(!s_globalTest8c()->q); diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp index c648d7d0..054dbd4d 100644 --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -2344,7 +2344,7 @@ int main(int argc, char **argv) cpp << "}" << endl << endl; if (cfgFileNameArg) { - auto instance = [&cfg, &cpp] (const QString &type, const QString &arg, bool wrap) { + auto instance = [&cfg, &cpp] (const QString &type, const QString &arg, bool isString) { cpp << "void " << cfg.className << "::instance(" << type << " " << arg << ")" << endl; cpp << "{" << endl; cpp << " if (s_global" << cfg.className << "()->q) {" << endl; @@ -2352,10 +2352,10 @@ int main(int argc, char **argv) cpp << " return;" << endl; cpp << " }" << endl; cpp << " new " << cfg.className << "("; - if (wrap) { + if (isString) { cpp << "KSharedConfig::openConfig(" << arg << ")"; } else { - cpp << arg; + cpp << "std::move(" << arg << ")"; } cpp << ");" << endl; cpp << " s_global" << cfg.className << "()->q->read();" << endl; @@ -2402,7 +2402,11 @@ int main(int argc, char **argv) cpp << " QStringLiteral( \"" << cfgFileName << "\" "; } if (cfgFileNameArg) { - cpp << " config "; + if (! cfg.forceStringFilename) { + cpp << " std::move( config ) "; + } else { + cpp << " config "; + } } if (!cfgFileName.isEmpty()) { cpp << ") "; |