aboutsummaryrefslogtreecommitdiff
path: root/autotests/kconfig_compiler
diff options
context:
space:
mode:
Diffstat (limited to 'autotests/kconfig_compiler')
-rw-r--r--autotests/kconfig_compiler/kconfigcompiler_test.cpp56
-rw-r--r--autotests/kconfig_compiler/kconfigcompiler_test.h2
-rw-r--r--autotests/kconfig_compiler/myprefs.h4
-rw-r--r--autotests/kconfig_compiler/test10main.cpp12
-rw-r--r--autotests/kconfig_compiler/test11main.cpp16
-rw-r--r--autotests/kconfig_compiler/test12main.cpp8
-rw-r--r--autotests/kconfig_compiler/test1main.cpp12
-rw-r--r--autotests/kconfig_compiler/test2main.cpp12
-rw-r--r--autotests/kconfig_compiler/test3amain.cpp12
-rw-r--r--autotests/kconfig_compiler/test3main.cpp12
-rw-r--r--autotests/kconfig_compiler/test4main.cpp12
-rw-r--r--autotests/kconfig_compiler/test5main.cpp12
-rw-r--r--autotests/kconfig_compiler/test6main.cpp12
-rw-r--r--autotests/kconfig_compiler/test7main.cpp12
-rw-r--r--autotests/kconfig_compiler/test8main.cpp18
-rw-r--r--autotests/kconfig_compiler/test9main.cpp28
-rw-r--r--autotests/kconfig_compiler/test_dpointer_main.cpp12
-rw-r--r--autotests/kconfig_compiler/test_signal_main.cpp12
18 files changed, 130 insertions, 134 deletions
diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.cpp b/autotests/kconfig_compiler/kconfigcompiler_test.cpp
index a9bf52c8..48192f5e 100644
--- a/autotests/kconfig_compiler/kconfigcompiler_test.cpp
+++ b/autotests/kconfig_compiler/kconfigcompiler_test.cpp
@@ -25,32 +25,30 @@
// QT5 TODO QTEST_GUILESS_MAIN(KConfigCompiler_Test)
QTEST_MAIN(KConfigCompiler_Test)
-typedef const char * CompilerTestSet[];
-
-static CompilerTestSet testCases =
-{
- "test1.cpp", "test1.h",
- "test2.cpp", "test2.h",
- "test3.cpp", "test3.h",
- "test3a.cpp", "test3a.h",
- "test4.cpp", "test4.h",
- "test5.cpp", "test5.h",
- "test6.cpp", "test6.h",
- "test7.cpp", "test7.h",
- "test8a.cpp", "test8a.h",
- "test8b.cpp", "test8b.h",
- "test9.h", "test9.cpp",
- "test10.h", "test10.cpp",
- "test11.h", "test11.cpp",
- "test11a.h", "test11a.cpp",
- "test12.h", "test12.cpp",
- "test_dpointer.cpp", "test_dpointer.h",
- "test_signal.cpp", "test_signal.h",
- NULL
+typedef const char *CompilerTestSet[];
+
+static CompilerTestSet testCases = {
+ "test1.cpp", "test1.h",
+ "test2.cpp", "test2.h",
+ "test3.cpp", "test3.h",
+ "test3a.cpp", "test3a.h",
+ "test4.cpp", "test4.h",
+ "test5.cpp", "test5.h",
+ "test6.cpp", "test6.h",
+ "test7.cpp", "test7.h",
+ "test8a.cpp", "test8a.h",
+ "test8b.cpp", "test8b.h",
+ "test9.h", "test9.cpp",
+ "test10.h", "test10.cpp",
+ "test11.h", "test11.cpp",
+ "test11a.h", "test11a.cpp",
+ "test12.h", "test12.cpp",
+ "test_dpointer.cpp", "test_dpointer.h",
+ "test_signal.cpp", "test_signal.h",
+ NULL
};
-static CompilerTestSet testCasesToRun =
-{
+static CompilerTestSet testCasesToRun = {
"test1",
"test2",
"test3",
@@ -70,11 +68,10 @@ static CompilerTestSet testCasesToRun =
};
#if 0
-static CompilerTestSet willFailCases =
-{
- // where is that QDir coming from?
- //"test9.cpp", NULL
- NULL
+static CompilerTestSet willFailCases = {
+ // where is that QDir coming from?
+ //"test9.cpp", NULL
+ NULL
};
#endif
@@ -153,7 +150,6 @@ void KConfigCompiler_Test::testRunning()
QCOMPARE(process.exitCode(), 0);
}
-
void KConfigCompiler_Test::appendFileDiff(const QString &oldFile, const QString &newFile)
{
if (m_diffExe.isEmpty()) {
diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.h b/autotests/kconfig_compiler/kconfigcompiler_test.h
index 53ad18a0..940044a8 100644
--- a/autotests/kconfig_compiler/kconfigcompiler_test.h
+++ b/autotests/kconfig_compiler/kconfigcompiler_test.h
@@ -24,7 +24,7 @@ class QString;
class KConfigCompiler_Test : public QObject
{
- Q_OBJECT
+ Q_OBJECT
private Q_SLOTS:
void initTestCase();
void testBaselineComparison_data();
diff --git a/autotests/kconfig_compiler/myprefs.h b/autotests/kconfig_compiler/myprefs.h
index 4d12eeb7..609fc546 100644
--- a/autotests/kconfig_compiler/myprefs.h
+++ b/autotests/kconfig_compiler/myprefs.h
@@ -5,8 +5,8 @@
class MyPrefs : public KConfigSkeleton
{
- public:
- MyPrefs( const QString &a ) : KConfigSkeleton( a ) {}
+public:
+ MyPrefs(const QString &a) : KConfigSkeleton(a) {}
};
#endif
diff --git a/autotests/kconfig_compiler/test10main.cpp b/autotests/kconfig_compiler/test10main.cpp
index 9e9a7db8..6dccda1b 100644
--- a/autotests/kconfig_compiler/test10main.cpp
+++ b/autotests/kconfig_compiler/test10main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test10.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test10 *t = Test10::self();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test10 *t = Test10::self();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test11main.cpp b/autotests/kconfig_compiler/test11main.cpp
index 4f5fc80c..339ecc71 100644
--- a/autotests/kconfig_compiler/test11main.cpp
+++ b/autotests/kconfig_compiler/test11main.cpp
@@ -22,13 +22,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test11a.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test11 *t = new Test11();
- Test11a *t2 = new Test11a();
- delete t;
- delete t2;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test11 *t = new Test11();
+ Test11a *t2 = new Test11a();
+ delete t;
+ delete t2;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test12main.cpp b/autotests/kconfig_compiler/test12main.cpp
index b8a05294..9c049f1b 100644
--- a/autotests/kconfig_compiler/test12main.cpp
+++ b/autotests/kconfig_compiler/test12main.cpp
@@ -20,9 +20,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "test12.h"
-int main( int, char** )
+int main(int, char **)
{
- Test12 *t = new Test12();
- delete t;
- return 0;
+ Test12 *t = new Test12();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test1main.cpp b/autotests/kconfig_compiler/test1main.cpp
index f1f61c0a..d7dc038d 100644
--- a/autotests/kconfig_compiler/test1main.cpp
+++ b/autotests/kconfig_compiler/test1main.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test1.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test1 *t = new Test1( QString(), QString() );
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test1 *t = new Test1(QString(), QString());
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test2main.cpp b/autotests/kconfig_compiler/test2main.cpp
index 80203c65..a70241f7 100644
--- a/autotests/kconfig_compiler/test2main.cpp
+++ b/autotests/kconfig_compiler/test2main.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test2.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test2 *t = new Test2();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test2 *t = new Test2();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test3amain.cpp b/autotests/kconfig_compiler/test3amain.cpp
index fa33f1cb..e08bf7ac 100644
--- a/autotests/kconfig_compiler/test3amain.cpp
+++ b/autotests/kconfig_compiler/test3amain.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test3a.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- TestNameSpace::InnerNameSpace::Test3a *t = new TestNameSpace::InnerNameSpace::Test3a();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ TestNameSpace::InnerNameSpace::Test3a *t = new TestNameSpace::InnerNameSpace::Test3a();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test3main.cpp b/autotests/kconfig_compiler/test3main.cpp
index bf2846c1..82680bf8 100644
--- a/autotests/kconfig_compiler/test3main.cpp
+++ b/autotests/kconfig_compiler/test3main.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test3.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- TestNameSpace::Test3 *t = new TestNameSpace::Test3();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ TestNameSpace::Test3 *t = new TestNameSpace::Test3();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test4main.cpp b/autotests/kconfig_compiler/test4main.cpp
index 3ef924c8..8f1c1ec8 100644
--- a/autotests/kconfig_compiler/test4main.cpp
+++ b/autotests/kconfig_compiler/test4main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test4.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test4 *t = Test4::self();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test4 *t = Test4::self();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test5main.cpp b/autotests/kconfig_compiler/test5main.cpp
index 55e30d07..95ed498b 100644
--- a/autotests/kconfig_compiler/test5main.cpp
+++ b/autotests/kconfig_compiler/test5main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test5.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test5 *t = Test5::self();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test5 *t = Test5::self();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test6main.cpp b/autotests/kconfig_compiler/test6main.cpp
index a60d8378..48932475 100644
--- a/autotests/kconfig_compiler/test6main.cpp
+++ b/autotests/kconfig_compiler/test6main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test6.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test6 *t = new Test6(QString());
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test6 *t = new Test6(QString());
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test7main.cpp b/autotests/kconfig_compiler/test7main.cpp
index bf55be20..16fee863 100644
--- a/autotests/kconfig_compiler/test7main.cpp
+++ b/autotests/kconfig_compiler/test7main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test7.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test7 *t = new Test7(42);
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test7 *t = new Test7(42);
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test8main.cpp b/autotests/kconfig_compiler/test8main.cpp
index c4576911..b8fcc492 100644
--- a/autotests/kconfig_compiler/test8main.cpp
+++ b/autotests/kconfig_compiler/test8main.cpp
@@ -23,14 +23,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test8b.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test8a *config1 = new Test8a( KSharedConfig::openConfig( QString() ) );
- Test8a *config2 = new Test8a();
- Test8b::self();
- delete config1;
- delete config2;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test8a *config1 = new Test8a(KSharedConfig::openConfig(QString()));
+ Test8a *config2 = new Test8a();
+ Test8b::self();
+ delete config1;
+ delete config2;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test9main.cpp b/autotests/kconfig_compiler/test9main.cpp
index 352613aa..28205ee5 100644
--- a/autotests/kconfig_compiler/test9main.cpp
+++ b/autotests/kconfig_compiler/test9main.cpp
@@ -23,23 +23,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <QGuiApplication>
#include <QDebug>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- Test9 *t = new Test9( QString(), QString() );
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ Test9 *t = new Test9(QString(), QString());
- QStringList myPathsList2 = t->myPathsList2();
- qWarning() << myPathsList2;
+ QStringList myPathsList2 = t->myPathsList2();
+ qWarning() << myPathsList2;
- // add another path
- QStringList newlist;
- myPathsList2 << QDir::homePath() + QString::fromLatin1("/.kde");
- qWarning() << myPathsList2;
+ // add another path
+ QStringList newlist;
+ myPathsList2 << QDir::homePath() + QString::fromLatin1("/.kde");
+ qWarning() << myPathsList2;
- t->setMyPathsList2(myPathsList2);
- qWarning() << t->myPathsList2();
+ t->setMyPathsList2(myPathsList2);
+ qWarning() << t->myPathsList2();
- delete t;
- return 0;
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test_dpointer_main.cpp b/autotests/kconfig_compiler/test_dpointer_main.cpp
index 6e4cb806..884b1e1b 100644
--- a/autotests/kconfig_compiler/test_dpointer_main.cpp
+++ b/autotests/kconfig_compiler/test_dpointer_main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test_dpointer.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- TestDPointer *t = TestDPointer::self();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ TestDPointer *t = TestDPointer::self();
+ delete t;
+ return 0;
}
diff --git a/autotests/kconfig_compiler/test_signal_main.cpp b/autotests/kconfig_compiler/test_signal_main.cpp
index 3189e79a..09e23ed5 100644
--- a/autotests/kconfig_compiler/test_signal_main.cpp
+++ b/autotests/kconfig_compiler/test_signal_main.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "test_signal.h"
#include <QGuiApplication>
-int main( int argc, char **argv )
+int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- Q_UNUSED(app);
- TestSignal *t = TestSignal::self();
- delete t;
- return 0;
+ QGuiApplication app(argc, argv);
+ Q_UNUSED(app);
+ TestSignal *t = TestSignal::self();
+ delete t;
+ return 0;
}