From 984c25aa6969e55896e9a13c8e7f7b8a58991a4e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:32:40 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kunittest/module.h   | 4 ++--
 kunittest/tester.cpp | 2 +-
 kunittest/tester.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kunittest')

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 55f9d541d..11a24e653 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 278f0d18d..061f319b3 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
-- 
cgit v1.2.1