diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:32:40 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:04:52 +0200 |
| commit | e2867c1f1eec514d56386f2fc5350eaaf760532a (patch) | |
| tree | 4803ad36a38c00b3ff22af6763e86d92a60629ee /kunittest | |
| parent | 4418657ced76d97d20c3a4aeb79fefccdbd6ad7b (diff) | |
| download | tdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.tar.gz tdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 984c25aa6969e55896e9a13c8e7f7b8a58991a4e)
Diffstat (limited to 'kunittest')
| -rw-r--r-- | kunittest/module.h | 4 | ||||
| -rw-r--r-- | kunittest/tester.cpp | 2 | ||||
| -rw-r--r-- | kunittest/tester.h | 2 |
3 files changed, 4 insertions, 4 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/tester.cpp b/kunittest/tester.cpp index ea8159421..3faf3997e 100644 --- a/kunittest/tester.cpp +++ b/kunittest/tester.cpp @@ -48,7 +48,7 @@ namespace KUnitTest void SlotTester::allTests() { - TQStrList allSlots = tqmetaObject()->slotNames(); + TQStrList allSlots = metaObject()->slotNames(); if ( allSlots.contains("setUp()") > 0 ) invokeMember("setUp()"); diff --git a/kunittest/tester.h b/kunittest/tester.h index 0b4dc382f..9154d41cf 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 |