summaryrefslogtreecommitdiffstats
path: root/kunittest
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kunittest
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kunittest')
-rw-r--r--kunittest/module.h4
-rw-r--r--kunittest/runner.cpp4
-rw-r--r--kunittest/runner.h2
-rw-r--r--kunittest/tester.cpp8
-rw-r--r--kunittest/tester.h6
5 files changed, 12 insertions, 12 deletions
diff --git a/kunittest/module.h b/kunittest/module.h
index 4213ddcf0..7f4b24789 100644
--- a/kunittest/module.h
+++ b/kunittest/module.h
@@ -48,7 +48,7 @@ namespace KUnitTest
* @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode
*/
#define KUNITTEST_MODULE(library,suite) \
- static const TQString s_kunittest_suite = TQString::tqfromLatin1(suite); \
+ static const TQString s_kunittest_suite = TQString::fromLatin1(suite); \
class library##Module : public TQObject \
{ \
public: \
@@ -93,7 +93,7 @@ namespace KUnitTest
tester##ModuleAutoregister() \
{ \
KUnitTest::Tester *test = new tester(); \
- TQString name = s_kunittest_suite + TQString::tqfromLatin1("::") + TQString::fromLocal8Bit(#tester); \
+ TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
test->setName(name.local8Bit()); \
kunittest_registerModuleTester(name.local8Bit(), test ); \
} \
diff --git a/kunittest/runner.cpp b/kunittest/runner.cpp
index f0eb5c4df..580d451b8 100644
--- a/kunittest/runner.cpp
+++ b/kunittest/runner.cpp
@@ -57,7 +57,7 @@ namespace KUnitTest
TQDir dir(folder, "kunittest_*.la");
// Add the folder to the "module" resource such that the KLibLoader can
- // tqfind the modules in this folder.
+ // find the modules in this folder.
KGlobal::dirs()->addResourceDir("module", folder);
kdDebug() << "Looking in folder: " << dir.absPath() << endl;
@@ -203,7 +203,7 @@ namespace KUnitTest
void Runner::runTest(const char *name)
{
- Tester *test = m_registry.tqfind(name);
+ Tester *test = m_registry.find(name);
if ( test == 0L ) return;
if ( s_debugCapturingEnabled )
diff --git a/kunittest/runner.h b/kunittest/runner.h
index 1e0c1ec72..1bd6a3d15 100644
--- a/kunittest/runner.h
+++ b/kunittest/runner.h
@@ -94,7 +94,7 @@ namespace KUnitTest
*
* @see KUNITTEST_REGISTER_TESTER
*/
- class KUNITTEST_EXPORT Runner : public TQObject
+ class KUNITTEST_EXPORT Runner : public QObject
{
Q_OBJECT
diff --git a/kunittest/tester.cpp b/kunittest/tester.cpp
index 0ad956ba0..3faf3997e 100644
--- a/kunittest/tester.cpp
+++ b/kunittest/tester.cpp
@@ -48,9 +48,9 @@ namespace KUnitTest
void SlotTester::allTests()
{
- TQStrList allSlots = tqmetaObject()->slotNames();
+ TQStrList allSlots = metaObject()->slotNames();
- if ( allSlots.tqcontains("setUp()") > 0 ) invokeMember("setUp()");
+ if ( allSlots.contains("setUp()") > 0 ) invokeMember("setUp()");
for ( char *sl = allSlots.first(); sl; sl = allSlots.next() )
{
@@ -67,14 +67,14 @@ namespace KUnitTest
}
}
- if ( allSlots.tqcontains("tearDown()") > 0 ) invokeMember("tearDown()");
+ if ( allSlots.contains("tearDown()") > 0 ) invokeMember("tearDown()");
m_total->clear();
}
TestResults *SlotTester::results(const char *sl)
{
- if ( m_resultsList.tqfind(sl) == 0L ) m_resultsList.insert(sl, new TestResults());
+ if ( m_resultsList.find(sl) == 0L ) m_resultsList.insert(sl, new TestResults());
return m_resultsList[sl];
}
diff --git a/kunittest/tester.h b/kunittest/tester.h
index bc634fbfa..ff3a3d453 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -359,7 +359,7 @@ using namespace std;
*
* @code SKIP("Test skipped because of lack of foo support."); @endcode
*/
-#define SKIP( x ) skip( __FILE__, __LINE__, TQString::tqfromLatin1(#x))
+#define SKIP( x ) skip( __FILE__, __LINE__, TQString::fromLatin1(#x))
/*!
* A macro testing that @p expression throws an exception that is catched
@@ -512,14 +512,14 @@ namespace KUnitTest
typedef TQAsciiDictIterator<TestResults> TestResultsListIteratorType;
/*! The abstract Tester class forms the base class for all test cases. Users must
- * implement the void Tester::allTests() method. This method tqcontains the actual test.
+ * implement the void Tester::allTests() method. This method contains the actual test.
*
* Use the CHECK(x,y), XFAIL(x,y) and SKIP(x) macros in the allTests() method
* to perform the tests.
*
* @see CHECK, XFAIL, SKIP
*/
- class KUNITTEST_EXPORT Tester : public TQObject
+ class KUNITTEST_EXPORT Tester : public QObject
{
public:
Tester(const char *name = 0L)