namespaced build fixes for tests

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

cmake/profile.sh.cmake

@@ -13,7 +13,7 @@ safe_path_append() {
     IFS=":"
     found=""
     for i in $2;do
-        # TODO: maybe check for match without trailing slash too?
+        # TODO: maybe check for match with and without trailing slash too?
         if [ "$i" = "$3" ];then
             found="yes"
         fi

tests/auto/qlocale/CMakeLists.txt

@@ -1,6 +1,3 @@
-# TODO: fix them warnings
-add_definitions(-UQT_ASCII_CAST_WARNINGS)
-
 katie_test(tst_qlocale
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_qlocale.cpp
 )

tests/auto/qlocale/tst_qlocale.cpp

@@ -49,6 +49,7 @@
 
 #include <math.h>
 #include <float.h>
+#include <stdlib.h>
 
 // TODO: should check if feenableexcept is available
 #if defined(Q_OS_LINUX) && defined(__GLIBC__)
@@ -59,7 +60,7 @@
 #    include <fenv.h>
 #endif
 
-#include <stdlib.h>
+QT_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(qlonglong)
 Q_DECLARE_METATYPE(QDate)

tests/auto/qsqldatabase/CMakeLists.txt

@@ -1,6 +1,3 @@
-# TODO: fix them warnings
-add_definitions(-UQT_ASCII_CAST_WARNINGS)
-
 katie_test(tst_qsqldatabase
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_qsqldatabase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_databases.h

tests/auto/qsqldatabase/tst_qsqldatabase.cpp

@@ -54,6 +54,8 @@
 
 #define NODATABASE_SKIP "No database drivers are available in this Qt configuration"
 
+QT_USE_NAMESPACE
+
 #include "tst_databases.h"
 
 //TESTED_FILES=

tests/benchmarks/core/io/qiodevice/main.cpp

@@ -45,6 +45,7 @@
 
 #include <qtest.h>
 
+QT_USE_NAMESPACE
 
 class tst_qiodevice : public QObject
 {

tests/benchmarks/core/io/qtemporaryfile/main.cpp

@@ -45,6 +45,7 @@
 #include <QTemporaryFile>
 #include <qtest.h>
 
+QT_USE_NAMESPACE
 
 class tst_qtemporaryfile : public QObject
 {

tests/benchmarks/core/io/qurl/main.cpp

@@ -42,6 +42,8 @@
 #include <qurl.h>
 #include <qtest.h>
 
+QT_USE_NAMESPACE
+
 class tst_qurl: public QObject
 {
     Q_OBJECT

tests/benchmarks/core/kernel/events/main.cpp

@@ -43,6 +43,8 @@
 #include <qtest.h>
 #include <qtesteventloop.h>
 
+QT_USE_NAMESPACE
+
 class PingPong : public QObject
 {
 public:

tests/benchmarks/core/kernel/qmetaobject/main.cpp

@@ -42,6 +42,8 @@
 #include <QtGui>
 #include <qtest.h>
 
+QT_USE_NAMESPACE
+
 class LotsOfSignals : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/kernel/qmetatype/tst_qmetatype.cpp

@@ -42,6 +42,8 @@
 #include <qtest.h>
 #include <QtCore/qmetatype.h>
 
+QT_USE_NAMESPACE
+
 //TESTED_FILES=
 
 class tst_QMetaType : public QObject

tests/benchmarks/core/kernel/qobject/main.cpp

@@ -45,6 +45,8 @@
 #include <qcoreapplication.h>
 #include <qdatetime.h>
 
+QT_USE_NAMESPACE
+
 enum {
     CreationDeletionBenckmarkConstant = 34567,
     SignalsAndSlotsBenchmarkConstant = 456789

tests/benchmarks/core/kernel/qobject/object.h

@@ -43,6 +43,8 @@
 
 #include <qobject.h>
 
+QT_USE_NAMESPACE
+
 class Object : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp

@@ -44,6 +44,8 @@
 
 #define INVOKE_COUNT 10000
 
+QT_USE_NAMESPACE
+
 class qtimer_vs_qmetaobject : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/kernel/qvariant/tst_qvariant.cpp

@@ -45,6 +45,8 @@
 
 #define ITERATION_COUNT 1e5
 
+QT_USE_NAMESPACE
+
 class tst_qvariant : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/plugin/quuid/tst_quuid.cpp

@@ -43,6 +43,8 @@
 #include <QtCore/QUuid>
 #include <QtTest/QtTest>
 
+QT_USE_NAMESPACE
+
 class tst_bench_QUuid : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/thread/qmutex/tst_qmutex.cpp

@@ -43,10 +43,9 @@
 #include <QtTest/QtTest>
 
 #include <math.h>
-
-#if defined(Q_OS_UNIX)
 #include <pthread.h>
 #include <errno.h>
+
 typedef pthread_mutex_t NativeMutexType;
 void NativeMutexInitialize(NativeMutexType *mutex)
 {
@@ -64,27 +63,8 @@ void NativeMutexUnlock(NativeMutexType *mutex)
 {
     pthread_mutex_unlock(mutex);
 }
-#elif defined(Q_OS_WIN)
+
-#  define _WIN32_WINNT 0x0400
+QT_USE_NAMESPACE
-#  include <windows.h>
-typedef CRITICAL_SECTION NativeMutexType;
-void NativeMutexInitialize(NativeMutexType *mutex)
-{
-    InitializeCriticalSection(mutex);
-}
-void NativeMutexDestroy(NativeMutexType *mutex)
-{
-    DeleteCriticalSection(mutex);
-}
-void NativeMutexLock(NativeMutexType *mutex)
-{
-    EnterCriticalSection(mutex);
-}
-void NativeMutexUnlock(NativeMutexType *mutex)
-{
-    LeaveCriticalSection(mutex);
-}
-#endif
 
 //TESTED_FILES=
 

tests/benchmarks/core/thread/qwaitcondition/tst_qwaitcondition.cpp

@@ -44,6 +44,7 @@
 
 #include <math.h>
 
+QT_USE_NAMESPACE
 
 class tst_QWaitCondition : public QObject
 {

tests/benchmarks/core/tools/containers-associative/main.cpp

@@ -42,6 +42,8 @@
 
 #include <qtest.h>
 
+QT_USE_NAMESPACE
+
 class tst_associative_containers : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/containers-sequential/main.cpp

@@ -42,9 +42,11 @@
 
 #include <QtCore>
 #include <QVector>
+#include <qtest.h>
+
 #include <vector>
 
-#include <qtest.h>
+QT_USE_NAMESPACE
 
 template <typename T> // T is the item type
 class UseCases {

tests/benchmarks/core/tools/qbytearray/main.cpp

@@ -42,10 +42,11 @@
 #include <QIODevice>
 #include <QFile>
 #include <QString>
-
 #include <qtest.h>
 
 
+QT_USE_NAMESPACE
+
 class tst_qbytearray : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/qcontiguouscache/main.cpp

@@ -43,10 +43,12 @@
 #include <QTest>
 #include <QCache>
 #include <QContiguousCache>
-
 #include <QDebug>
+
 #include <stdio.h>
 
+QT_USE_NAMESPACE
+
 class tst_QContiguousCache : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/qhash/qhash_string.cpp

@@ -72,10 +72,8 @@ Totals: 4 passed, 0 failed, 0 skipped
 #include <QHash>
 #include <QString>
 #include <QStringList>
-
 #include <QTest>
 
-
 class tst_QHash : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/qhash/qhash_string.h

@@ -41,6 +41,8 @@
 
 #include <QString>
 
+QT_USE_NAMESPACE
+
 struct String : QString
 {
     String() {}

tests/benchmarks/core/tools/qline/main.cpp

@@ -44,6 +44,8 @@
 #include <qtest.h>
 #include <QLine>
 
+QT_USE_NAMESPACE
+
 class tst_qline : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/qlist/main.cpp

@@ -42,6 +42,8 @@
 #include <QList>
 #include <QTest>
 
+QT_USE_NAMESPACE
+
 static const int N = 1000;
 
 struct MyBase

tests/benchmarks/core/tools/qrect/main.cpp

@@ -43,6 +43,8 @@
 #include <QDebug>
 #include <qtest.h>
 
+QT_USE_NAMESPACE
+
 class tst_qrect : public QObject
 {
     Q_OBJECT

tests/benchmarks/core/tools/qregexp/main.cpp

@@ -43,13 +43,13 @@
 #include <QRegExp>
 #include <QString>
 #include <QFile>
-
 #include <qtest.h>
-
 #include <QtScript>
 
 #define ZLIB_VERSION "1.2.3.4"
 
+QT_USE_NAMESPACE
+
 class tst_qregexp : public QObject
 {
     Q_OBJECT