diff options
36 files changed, 41 insertions, 41 deletions
diff --git a/autotests/kconfig_compiler/test1.cpp.ref b/autotests/kconfig_compiler/test1.cpp.ref index 611ce5c1..dcb3ffcb 100644 --- a/autotests/kconfig_compiler/test1.cpp.ref +++ b/autotests/kconfig_compiler/test1.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test1.kcfg. +// This file is generated by kconfig_compiler_kf5 from test1.kcfg. // All changes you do to this file will be lost. #include "test1.h" diff --git a/autotests/kconfig_compiler/test1.h.ref b/autotests/kconfig_compiler/test1.h.ref index 57fa4bf8..3410a60d 100644 --- a/autotests/kconfig_compiler/test1.h.ref +++ b/autotests/kconfig_compiler/test1.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test1.kcfg. +// This file is generated by kconfig_compiler_kf5 from test1.kcfg. // All changes you do to this file will be lost. #ifndef TEST1_H #define TEST1_H diff --git a/autotests/kconfig_compiler/test10.cpp.ref b/autotests/kconfig_compiler/test10.cpp.ref index ac28ab2f..21aea9d8 100644 --- a/autotests/kconfig_compiler/test10.cpp.ref +++ b/autotests/kconfig_compiler/test10.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test10.kcfg. +// This file is generated by kconfig_compiler_kf5 from test10.kcfg. // All changes you do to this file will be lost. #include "test10.h" diff --git a/autotests/kconfig_compiler/test10.h.ref b/autotests/kconfig_compiler/test10.h.ref index f3f441d3..93839a54 100644 --- a/autotests/kconfig_compiler/test10.h.ref +++ b/autotests/kconfig_compiler/test10.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test10.kcfg. +// This file is generated by kconfig_compiler_kf5 from test10.kcfg. // All changes you do to this file will be lost. #ifndef TEST10_H #define TEST10_H diff --git a/autotests/kconfig_compiler/test11.cpp.ref b/autotests/kconfig_compiler/test11.cpp.ref index 5a1f5b92..1e6ff9e2 100644 --- a/autotests/kconfig_compiler/test11.cpp.ref +++ b/autotests/kconfig_compiler/test11.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test11.kcfg. +// This file is generated by kconfig_compiler_kf5 from test11.kcfg. // All changes you do to this file will be lost. #include "test11.h" diff --git a/autotests/kconfig_compiler/test11.h.ref b/autotests/kconfig_compiler/test11.h.ref index b5eeb74c..c60bb201 100644 --- a/autotests/kconfig_compiler/test11.h.ref +++ b/autotests/kconfig_compiler/test11.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test11.kcfg. +// This file is generated by kconfig_compiler_kf5 from test11.kcfg. // All changes you do to this file will be lost. #ifndef TEST11_H #define TEST11_H diff --git a/autotests/kconfig_compiler/test11a.cpp.ref b/autotests/kconfig_compiler/test11a.cpp.ref index f826fc16..91656612 100644 --- a/autotests/kconfig_compiler/test11a.cpp.ref +++ b/autotests/kconfig_compiler/test11a.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test11a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test11a.kcfg. // All changes you do to this file will be lost. #include "test11a.h" diff --git a/autotests/kconfig_compiler/test11a.h.ref b/autotests/kconfig_compiler/test11a.h.ref index 4410ce29..16bdb760 100644 --- a/autotests/kconfig_compiler/test11a.h.ref +++ b/autotests/kconfig_compiler/test11a.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test11a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test11a.kcfg. // All changes you do to this file will be lost. #ifndef TEST11A_H #define TEST11A_H diff --git a/autotests/kconfig_compiler/test12.cpp.ref b/autotests/kconfig_compiler/test12.cpp.ref index 69d5bba9..e1cd01a6 100644 --- a/autotests/kconfig_compiler/test12.cpp.ref +++ b/autotests/kconfig_compiler/test12.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test12.kcfg. +// This file is generated by kconfig_compiler_kf5 from test12.kcfg. // All changes you do to this file will be lost. #include "test12.h" diff --git a/autotests/kconfig_compiler/test12.h.ref b/autotests/kconfig_compiler/test12.h.ref index d55414ec..d96d4609 100644 --- a/autotests/kconfig_compiler/test12.h.ref +++ b/autotests/kconfig_compiler/test12.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test12.kcfg. +// This file is generated by kconfig_compiler_kf5 from test12.kcfg. // All changes you do to this file will be lost. #ifndef TEST12_H #define TEST12_H diff --git a/autotests/kconfig_compiler/test2.cpp.ref b/autotests/kconfig_compiler/test2.cpp.ref index 476b34c5..e99eb7c7 100644 --- a/autotests/kconfig_compiler/test2.cpp.ref +++ b/autotests/kconfig_compiler/test2.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test2.kcfg. +// This file is generated by kconfig_compiler_kf5 from test2.kcfg. // All changes you do to this file will be lost. #include "test2.h" diff --git a/autotests/kconfig_compiler/test2.h.ref b/autotests/kconfig_compiler/test2.h.ref index 49af161e..77ba56f9 100644 --- a/autotests/kconfig_compiler/test2.h.ref +++ b/autotests/kconfig_compiler/test2.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test2.kcfg. +// This file is generated by kconfig_compiler_kf5 from test2.kcfg. // All changes you do to this file will be lost. #ifndef TEST2_H #define TEST2_H diff --git a/autotests/kconfig_compiler/test3.cpp.ref b/autotests/kconfig_compiler/test3.cpp.ref index 0c9187a1..1ac95252 100644 --- a/autotests/kconfig_compiler/test3.cpp.ref +++ b/autotests/kconfig_compiler/test3.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test3.kcfg. +// This file is generated by kconfig_compiler_kf5 from test3.kcfg. // All changes you do to this file will be lost. #include "test3.h" diff --git a/autotests/kconfig_compiler/test3.h.ref b/autotests/kconfig_compiler/test3.h.ref index 931e2e26..bee48fb0 100644 --- a/autotests/kconfig_compiler/test3.h.ref +++ b/autotests/kconfig_compiler/test3.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test3.kcfg. +// This file is generated by kconfig_compiler_kf5 from test3.kcfg. // All changes you do to this file will be lost. #ifndef TESTNAMESPACE_TEST3_H #define TESTNAMESPACE_TEST3_H diff --git a/autotests/kconfig_compiler/test3a.cpp.ref b/autotests/kconfig_compiler/test3a.cpp.ref index 34321e9e..dc721718 100644 --- a/autotests/kconfig_compiler/test3a.cpp.ref +++ b/autotests/kconfig_compiler/test3a.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test3a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test3a.kcfg. // All changes you do to this file will be lost. #include "test3a.h" diff --git a/autotests/kconfig_compiler/test3a.h.ref b/autotests/kconfig_compiler/test3a.h.ref index 56d672a3..a44ce841 100644 --- a/autotests/kconfig_compiler/test3a.h.ref +++ b/autotests/kconfig_compiler/test3a.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test3a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test3a.kcfg. // All changes you do to this file will be lost. #ifndef TESTNAMESPACE_INNERNAMESPACE_TEST3A_H #define TESTNAMESPACE_INNERNAMESPACE_TEST3A_H diff --git a/autotests/kconfig_compiler/test4.cpp.ref b/autotests/kconfig_compiler/test4.cpp.ref index 171d655d..66d0357f 100644 --- a/autotests/kconfig_compiler/test4.cpp.ref +++ b/autotests/kconfig_compiler/test4.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test4.kcfg. +// This file is generated by kconfig_compiler_kf5 from test4.kcfg. // All changes you do to this file will be lost. #include "test4.h" diff --git a/autotests/kconfig_compiler/test4.h.ref b/autotests/kconfig_compiler/test4.h.ref index 991a4f7d..9a74d3f0 100644 --- a/autotests/kconfig_compiler/test4.h.ref +++ b/autotests/kconfig_compiler/test4.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test4.kcfg. +// This file is generated by kconfig_compiler_kf5 from test4.kcfg. // All changes you do to this file will be lost. #ifndef TEST4_H #define TEST4_H diff --git a/autotests/kconfig_compiler/test5.cpp.ref b/autotests/kconfig_compiler/test5.cpp.ref index 2a95dcda..088cc78f 100644 --- a/autotests/kconfig_compiler/test5.cpp.ref +++ b/autotests/kconfig_compiler/test5.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test5.kcfg. +// This file is generated by kconfig_compiler_kf5 from test5.kcfg. // All changes you do to this file will be lost. #include "test5.h" diff --git a/autotests/kconfig_compiler/test5.h.ref b/autotests/kconfig_compiler/test5.h.ref index 46a591c1..8d2cab2e 100644 --- a/autotests/kconfig_compiler/test5.h.ref +++ b/autotests/kconfig_compiler/test5.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test5.kcfg. +// This file is generated by kconfig_compiler_kf5 from test5.kcfg. // All changes you do to this file will be lost. #ifndef TEST5_H #define TEST5_H diff --git a/autotests/kconfig_compiler/test6.cpp.ref b/autotests/kconfig_compiler/test6.cpp.ref index 0fce03a3..629d828b 100644 --- a/autotests/kconfig_compiler/test6.cpp.ref +++ b/autotests/kconfig_compiler/test6.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test6.kcfg. +// This file is generated by kconfig_compiler_kf5 from test6.kcfg. // All changes you do to this file will be lost. #include "test6.h" diff --git a/autotests/kconfig_compiler/test6.h.ref b/autotests/kconfig_compiler/test6.h.ref index f1fb59fd..7a9998e2 100644 --- a/autotests/kconfig_compiler/test6.h.ref +++ b/autotests/kconfig_compiler/test6.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test6.kcfg. +// This file is generated by kconfig_compiler_kf5 from test6.kcfg. // All changes you do to this file will be lost. #ifndef TEST6_H #define TEST6_H diff --git a/autotests/kconfig_compiler/test7.cpp.ref b/autotests/kconfig_compiler/test7.cpp.ref index 4ee7d280..f506b095 100644 --- a/autotests/kconfig_compiler/test7.cpp.ref +++ b/autotests/kconfig_compiler/test7.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test7.kcfg. +// This file is generated by kconfig_compiler_kf5 from test7.kcfg. // All changes you do to this file will be lost. #include "test7.h" diff --git a/autotests/kconfig_compiler/test7.h.ref b/autotests/kconfig_compiler/test7.h.ref index 417c75ad..694dba51 100644 --- a/autotests/kconfig_compiler/test7.h.ref +++ b/autotests/kconfig_compiler/test7.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test7.kcfg. +// This file is generated by kconfig_compiler_kf5 from test7.kcfg. // All changes you do to this file will be lost. #ifndef TEST7_H #define TEST7_H diff --git a/autotests/kconfig_compiler/test8a.cpp.ref b/autotests/kconfig_compiler/test8a.cpp.ref index af85f0ce..00d4d02c 100644 --- a/autotests/kconfig_compiler/test8a.cpp.ref +++ b/autotests/kconfig_compiler/test8a.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test8a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test8a.kcfg. // All changes you do to this file will be lost. #include "test8a.h" diff --git a/autotests/kconfig_compiler/test8a.h.ref b/autotests/kconfig_compiler/test8a.h.ref index fd1b3648..ec9d64b7 100644 --- a/autotests/kconfig_compiler/test8a.h.ref +++ b/autotests/kconfig_compiler/test8a.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test8a.kcfg. +// This file is generated by kconfig_compiler_kf5 from test8a.kcfg. // All changes you do to this file will be lost. #ifndef TEST8A_H #define TEST8A_H diff --git a/autotests/kconfig_compiler/test8b.cpp.ref b/autotests/kconfig_compiler/test8b.cpp.ref index ba0c8b47..dcd61693 100644 --- a/autotests/kconfig_compiler/test8b.cpp.ref +++ b/autotests/kconfig_compiler/test8b.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test8b.kcfg. +// This file is generated by kconfig_compiler_kf5 from test8b.kcfg. // All changes you do to this file will be lost. #include "test8b.h" diff --git a/autotests/kconfig_compiler/test8b.h.ref b/autotests/kconfig_compiler/test8b.h.ref index 140bbb90..496ac696 100644 --- a/autotests/kconfig_compiler/test8b.h.ref +++ b/autotests/kconfig_compiler/test8b.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test8b.kcfg. +// This file is generated by kconfig_compiler_kf5 from test8b.kcfg. // All changes you do to this file will be lost. #ifndef TEST8B_H #define TEST8B_H diff --git a/autotests/kconfig_compiler/test9.cpp.ref b/autotests/kconfig_compiler/test9.cpp.ref index af90acd9..bc65f430 100644 --- a/autotests/kconfig_compiler/test9.cpp.ref +++ b/autotests/kconfig_compiler/test9.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test9.kcfg. +// This file is generated by kconfig_compiler_kf5 from test9.kcfg. // All changes you do to this file will be lost. #include "test9.h" diff --git a/autotests/kconfig_compiler/test9.h.ref b/autotests/kconfig_compiler/test9.h.ref index 02b3d479..f2290f87 100644 --- a/autotests/kconfig_compiler/test9.h.ref +++ b/autotests/kconfig_compiler/test9.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test9.kcfg. +// This file is generated by kconfig_compiler_kf5 from test9.kcfg. // All changes you do to this file will be lost. #ifndef TEST9_H #define TEST9_H diff --git a/autotests/kconfig_compiler/test_dpointer.cpp.ref b/autotests/kconfig_compiler/test_dpointer.cpp.ref index ffe931e5..e50bf8aa 100644 --- a/autotests/kconfig_compiler/test_dpointer.cpp.ref +++ b/autotests/kconfig_compiler/test_dpointer.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test_dpointer.kcfg. +// This file is generated by kconfig_compiler_kf5 from test_dpointer.kcfg. // All changes you do to this file will be lost. #include "test_dpointer.h" diff --git a/autotests/kconfig_compiler/test_dpointer.h.ref b/autotests/kconfig_compiler/test_dpointer.h.ref index e10c8c7c..04938566 100644 --- a/autotests/kconfig_compiler/test_dpointer.h.ref +++ b/autotests/kconfig_compiler/test_dpointer.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test_dpointer.kcfg. +// This file is generated by kconfig_compiler_kf5 from test_dpointer.kcfg. // All changes you do to this file will be lost. #ifndef TESTDPOINTER_H #define TESTDPOINTER_H diff --git a/autotests/kconfig_compiler/test_signal.cpp.ref b/autotests/kconfig_compiler/test_signal.cpp.ref index 1dad37b5..fd2d4bc9 100644 --- a/autotests/kconfig_compiler/test_signal.cpp.ref +++ b/autotests/kconfig_compiler/test_signal.cpp.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test_signal.kcfg. +// This file is generated by kconfig_compiler_kf5 from test_signal.kcfg. // All changes you do to this file will be lost. #include "test_signal.h" @@ -25,7 +25,7 @@ TestSignal *TestSignal::self() } TestSignal::TestSignal( ) - : KConfigSkeleton( QLatin1String( "kconfig_compiler_test_rc" ) ) + : KConfigSkeleton( QLatin1String( "kconfig_compiler_kf5_test_rc" ) ) , mSettingsChanged(0) { Q_ASSERT(!s_globalTestSignal()->q); diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconfig_compiler/test_signal.h.ref index 801ff926..737718d0 100644 --- a/autotests/kconfig_compiler/test_signal.h.ref +++ b/autotests/kconfig_compiler/test_signal.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from test_signal.kcfg. +// This file is generated by kconfig_compiler_kf5 from test_signal.kcfg. // All changes you do to this file will be lost. #ifndef TESTSIGNAL_H #define TESTSIGNAL_H diff --git a/src/kconfig_compiler/checkkcfg.pl b/src/kconfig_compiler/checkkcfg.pl index 2eddbeee..9ebcbf83 100755 --- a/src/kconfig_compiler/checkkcfg.pl +++ b/src/kconfig_compiler/checkkcfg.pl @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; -$cmd = "./kconfig_compiler $file $kcfgc"; +$cmd = "./kconfig_compiler_kf5 $file $kcfgc"; #print "CMD $cmd\n"; if ( system( $cmd ) != 0 ) { - print STDERR "Unable to run kconfig_compiler\n"; + print STDERR "Unable to run kconfig_compiler_kf5\n"; exit 1; } diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp index bdbd03c3..1c8d1bc2 100644 --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -1073,7 +1073,7 @@ QString param(const QString &t) } else if (type == "urllist") { return "const QList<QUrl> &"; } else { - cerr << "kconfig_compiler does not support type \"" << type << "\"" << endl; + cerr << "kconfig_compiler_kf5 does not support type \"" << type << "\"" << endl; return "QString"; //For now, but an assert would be better } } @@ -1127,7 +1127,7 @@ QString cppType(const QString &t) } else if (type == "urllist") { return "QList<QUrl>"; } else { - cerr << "kconfig_compiler does not support type \"" << type << "\"" << endl; + cerr << "kconfig_compiler_kf5 does not support type \"" << type << "\"" << endl; return "QString"; //For now, but an assert would be better } } @@ -1178,7 +1178,7 @@ QString defaultValue(const QString &t) } else if (type == "urllist") { return "QList<QUrl>()"; } else { - cerr << "Error, kconfig_compiler does not support the \"" << type << "\" type!" << endl; + cerr << "Error, kconfig_compiler_kf5 does not support the \"" << type << "\" type!" << endl; return "QString"; //For now, but an assert would be better } } @@ -1705,7 +1705,7 @@ int main(int argc, char **argv) QTextStream h(&header); - h << "// This file is generated by kconfig_compiler from " << QFileInfo(inputFilename).fileName() << "." << endl; + h << "// This file is generated by kconfig_compiler_kf5 from " << QFileInfo(inputFilename).fileName() << "." << endl; h << "// All changes you do to this file will be lost." << endl; h << "#ifndef " << (!cfg.nameSpace.isEmpty() ? QString(QString(cfg.nameSpace).replace("::", "_").toUpper() + '_') : "") |