summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/testlib/qbenchmarkvalgrind.cpp5
-rw-r--r--src/testlib/qtestbasicstreamer.cpp5
-rw-r--r--src/testlib/qtestbasicstreamer.h7
-rw-r--r--src/testlib/qtestcoreelement.h4
-rw-r--r--src/testlib/qtestcorelist.h6
-rw-r--r--src/testlib/qtestelement.cpp5
-rw-r--r--src/testlib/qtestelement.h4
-rw-r--r--src/testlib/qtestelementattribute.cpp5
-rw-r--r--src/testlib/qtestelementattribute.h4
-rw-r--r--src/testlib/qtestfilelogger.cpp5
-rw-r--r--src/testlib/qtestfilelogger.h6
-rw-r--r--src/testlib/qtestlightxmlstreamer.cpp5
-rw-r--r--src/testlib/qtestlightxmlstreamer.h4
-rw-r--r--src/testlib/qtestlogger.cpp4
-rw-r--r--src/testlib/qtestlogger_p.h4
-rw-r--r--src/testlib/qtestxmlstreamer.cpp5
-rw-r--r--src/testlib/qtestxmlstreamer.h4
-rw-r--r--src/testlib/qtestxunitstreamer.cpp5
-rw-r--r--src/testlib/qtestxunitstreamer.h4
19 files changed, 88 insertions, 3 deletions
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 4b4ccd7..bcce147 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -1,4 +1,3 @@
-
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -52,6 +51,8 @@
#include <QtCore/qset.h>
#include "3rdparty/callgrind_p.h"
+QT_BEGIN_NAMESPACE
+
// Returns true iff a sufficiently recent valgrind is available.
bool QBenchmarkValgrindUtils::haveValgrind()
{
@@ -272,4 +273,6 @@ QString QBenchmarkCallgrindMeasurer::metricText()
return QLatin1String("callgrind");
}
+QT_END_NAMESPACE
+
#endif // QTESTLIB_USE_VALGRIND
diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp
index c23124a..b133aae 100644
--- a/src/testlib/qtestbasicstreamer.cpp
+++ b/src/testlib/qtestbasicstreamer.cpp
@@ -12,6 +12,8 @@
#include <unistd.h>
#endif
+QT_BEGIN_NAMESPACE
+
namespace QTest
{
static FILE *stream = 0;
@@ -171,3 +173,6 @@ const QTestLogger *QTestBasicStreamer::logger() const
{
return testLogger;
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestbasicstreamer.h b/src/testlib/qtestbasicstreamer.h
index 0d64438..cfd6b94 100644
--- a/src/testlib/qtestbasicstreamer.h
+++ b/src/testlib/qtestbasicstreamer.h
@@ -1,6 +1,10 @@
#ifndef QTESTBASICSTREAMER_H
#define QTESTBASICSTREAMER_H
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
class QTestElement;
class QTestElementAttribute;
class QTestLogger;
@@ -33,4 +37,7 @@ class QTestBasicStreamer
private:
const QTestLogger *testLogger;
};
+
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement.h
index 9fe7e61..ea05c19 100644
--- a/src/testlib/qtestcoreelement.h
+++ b/src/testlib/qtestcoreelement.h
@@ -4,6 +4,8 @@
#include "qtestcorelist.h"
#include "qtestelementattribute.h"
+QT_BEGIN_NAMESPACE
+
template <class ElementType>
class QTestCoreElement: public QTestCoreList<ElementType>
{
@@ -117,4 +119,6 @@ const QTestElementAttribute *QTestCoreElement<ElementType>::attribute(QTest::Att
return 0;
}
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestcorelist.h b/src/testlib/qtestcorelist.h
index 086ae14..8e008a4 100644
--- a/src/testlib/qtestcorelist.h
+++ b/src/testlib/qtestcorelist.h
@@ -1,6 +1,10 @@
#ifndef QTESTCORELIST_H
#define QTESTCORELIST_H
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
template <class T>
class QTestCoreList
{
@@ -80,4 +84,6 @@ int QTestCoreList<T>::count()
return numOfElements;
}
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index 326ebf8..55341d4 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -1,5 +1,7 @@
#include "qtestelement.h"
+QT_BEGIN_NAMESPACE
+
QTestElement::QTestElement(int type)
:QTestCoreElement<QTestElement>(type),
listOfChildren(0),
@@ -40,3 +42,6 @@ void QTestElement::setParent(const QTestElement *p)
{
parent = p;
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestelement.h b/src/testlib/qtestelement.h
index e2a28fc..f5d7466 100644
--- a/src/testlib/qtestelement.h
+++ b/src/testlib/qtestelement.h
@@ -3,6 +3,8 @@
#include "qtestcoreelement.h"
+QT_BEGIN_NAMESPACE
+
class QTestElement: public QTestCoreElement<QTestElement>
{
public:
@@ -21,4 +23,6 @@ class QTestElement: public QTestCoreElement<QTestElement>
};
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index fe746ef..64f9da5 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -3,6 +3,8 @@
#include <string.h>
#include <stdlib.h>
+QT_BEGIN_NAMESPACE
+
QTestElementAttribute::QTestElementAttribute()
:attributeValue(0),
attributeIndex(QTest::AI_Undefined)
@@ -69,3 +71,6 @@ bool QTestElementAttribute::setPair(QTest::AttributeIndex index, const char *val
return (attributeValue!=0) ? true:false;
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestelementattribute.h b/src/testlib/qtestelementattribute.h
index 8f9dc06..2e23cd9 100644
--- a/src/testlib/qtestelementattribute.h
+++ b/src/testlib/qtestelementattribute.h
@@ -3,6 +3,8 @@
#include "qtestcorelist.h"
+QT_BEGIN_NAMESPACE
+
namespace QTest {
enum AttributeIndex
@@ -56,4 +58,6 @@ class QTestElementAttribute: public QTestCoreList<QTestElementAttribute>
QTest::AttributeIndex attributeIndex;
};
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp
index 5bad653..f753b83 100644
--- a/src/testlib/qtestfilelogger.cpp
+++ b/src/testlib/qtestfilelogger.cpp
@@ -6,6 +6,8 @@
#include <stdlib.h>
#include <stdio.h>
+QT_BEGIN_NAMESPACE
+
namespace QTest
{
static FILE *stream = 0;
@@ -47,3 +49,6 @@ void QTestFileLogger::flush(const char *msg)
::fputs(msg, QTest::stream);
::fflush(QTest::stream);
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestfilelogger.h b/src/testlib/qtestfilelogger.h
index 1805134..4dca090 100644
--- a/src/testlib/qtestfilelogger.h
+++ b/src/testlib/qtestfilelogger.h
@@ -1,6 +1,10 @@
#ifndef QTESTFILELOGGER_H
#define QTESTFILELOGGER_H
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
class QTestFileLogger
{
public:
@@ -11,4 +15,6 @@ class QTestFileLogger
void flush(const char *msg);
};
+QT_END_NAMESPACE
+
#endif // QTESTFILELOGGER_H
diff --git a/src/testlib/qtestlightxmlstreamer.cpp b/src/testlib/qtestlightxmlstreamer.cpp
index b627a4e..73b33ef 100644
--- a/src/testlib/qtestlightxmlstreamer.cpp
+++ b/src/testlib/qtestlightxmlstreamer.cpp
@@ -8,6 +8,8 @@
#include <string.h>
+QT_BEGIN_NAMESPACE
+
QTestLightXmlStreamer::QTestLightXmlStreamer()
:QTestBasicStreamer()
{
@@ -137,3 +139,6 @@ void QTestLightXmlStreamer::output(QTestElement *element) const
QTestBasicStreamer::output(element);
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestlightxmlstreamer.h b/src/testlib/qtestlightxmlstreamer.h
index fb9f9e1..872eed2 100644
--- a/src/testlib/qtestlightxmlstreamer.h
+++ b/src/testlib/qtestlightxmlstreamer.h
@@ -3,6 +3,8 @@
#include "qtestbasicstreamer.h"
+QT_BEGIN_NAMESPACE
+
class QTestElement;
class QTestElementAttribute;
@@ -18,4 +20,6 @@ class QTestLightXmlStreamer: public QTestBasicStreamer
void output(QTestElement *element) const;
};
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp
index f03278b..c053c30 100644
--- a/src/testlib/qtestlogger.cpp
+++ b/src/testlib/qtestlogger.cpp
@@ -11,6 +11,8 @@
#include <string.h>
+QT_BEGIN_NAMESPACE
+
QTestLogger::QTestLogger(int fm)
:listOfTestcases(0), currentLogElement(0),
logFormatter(0), format( (TestLoggerFormat)fm ), filelogger(new QTestFileLogger),
@@ -333,3 +335,5 @@ int QTestLogger::infoCount() const
return infoCounter;
}
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestlogger_p.h b/src/testlib/qtestlogger_p.h
index dd1d580..3badb1d 100644
--- a/src/testlib/qtestlogger_p.h
+++ b/src/testlib/qtestlogger_p.h
@@ -3,12 +3,12 @@
#include <QtTest/private/qabstracttestlogger_p.h>
+QT_BEGIN_NAMESPACE
+
class QTestBasicStreamer;
class QTestElement;
class QTestFileLogger;
-QT_BEGIN_NAMESPACE
-
class QTestLogger : public QAbstractTestLogger
{
public:
diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp
index 16e421a..cf99b96 100644
--- a/src/testlib/qtestxmlstreamer.cpp
+++ b/src/testlib/qtestxmlstreamer.cpp
@@ -9,6 +9,8 @@
#include <string.h>
#include <stdio.h>
+QT_BEGIN_NAMESPACE
+
QTestXmlStreamer::QTestXmlStreamer()
:QTestBasicStreamer()
{
@@ -171,3 +173,6 @@ void QTestXmlStreamer::output(QTestElement *element) const
QTest::qt_snprintf(buf, sizeof(buf), "</TestCase>\n");
outputString(buf);
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h
index 9a960a2..e6858c6 100644
--- a/src/testlib/qtestxmlstreamer.h
+++ b/src/testlib/qtestxmlstreamer.h
@@ -3,6 +3,8 @@
#include "qtestbasicstreamer.h"
+QT_BEGIN_NAMESPACE
+
class QTestElement;
class QTestElementAttribute;
@@ -18,4 +20,6 @@ class QTestXmlStreamer: public QTestBasicStreamer
void output(QTestElement *element) const;
};
+QT_END_NAMESPACE
+
#endif
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index aa1b719..2d8b7c4 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -5,6 +5,8 @@
#include "QtTest/private/qtestresult_p.h"
#include "QtTest/private/qxmltestlogger_p.h"
+QT_BEGIN_NAMESPACE
+
QTestXunitStreamer::QTestXunitStreamer()
:QTestBasicStreamer()
{}
@@ -134,3 +136,6 @@ void QTestXunitStreamer::outputElements(QTestElement *element, bool) const
element = element->previousElement();
}
}
+
+QT_END_NAMESPACE
+
diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer.h
index 02c65fc..1ce9576 100644
--- a/src/testlib/qtestxunitstreamer.h
+++ b/src/testlib/qtestxunitstreamer.h
@@ -3,6 +3,8 @@
#include "qtestbasicstreamer.h"
+QT_BEGIN_NAMESPACE
+
class QTestLogger;
class QTestXunitStreamer: public QTestBasicStreamer
@@ -23,4 +25,6 @@ class QTestXunitStreamer: public QTestBasicStreamer
static void indentForElement(const QTestElement* element, char* buf, int size);
};
+QT_END_NAMESPACE
+
#endif
generated by cgit v0.12 at 2024-11-15 04:16:27 (GMT)