From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/komposer/core/tests/managertest.cpp | 4 ++-- libkdepim/komposer/core/tests/managertest.h | 6 +++--- libkdepim/komposer/core/tests/tester.cpp | 4 ++-- libkdepim/komposer/core/tests/tester.h | 10 +++++----- libkdepim/komposer/core/tests/testfactory.h | 10 +++++----- libkdepim/komposer/core/tests/testmanager.cpp | 16 ++++++++-------- libkdepim/komposer/core/tests/testmanager.h | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'libkdepim/komposer/core/tests') diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp index feec64599..487a84c59 100644 --- a/libkdepim/komposer/core/tests/managertest.cpp +++ b/libkdepim/komposer/core/tests/managertest.cpp @@ -23,8 +23,8 @@ #include "pluginmanager.h" using namespace Komposer; -ManagerTest::ManagerTest( QObject* parent ) - : QObject( parent ) +ManagerTest::ManagerTest( TQObject* parent ) + : TQObject( parent ) { m_manager = new PluginManager( this ); } diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h index 0148b29a8..397bfaf01 100644 --- a/libkdepim/komposer/core/tests/managertest.h +++ b/libkdepim/komposer/core/tests/managertest.h @@ -21,19 +21,19 @@ #ifndef MANAGERTEST_H #define MANAGERTEST_H -#include +#include #include "tester.h" namespace Komposer { class PluginManager; } -class ManagerTest : public QObject, +class ManagerTest : public TQObject, public Tester { Q_OBJECT public: - ManagerTest( QObject* parent = 0 ); + ManagerTest( TQObject* parent = 0 ); public slots: void allTests(); diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp index 7fe8a90b2..b32c89644 100644 --- a/libkdepim/komposer/core/tests/tester.cpp +++ b/libkdepim/komposer/core/tests/tester.cpp @@ -21,8 +21,8 @@ #include "tester.h" -Tester::Tester( QObject* parent ) - : QObject( parent ) +Tester::Tester( TQObject* parent ) + : TQObject( parent ) { } diff --git a/libkdepim/komposer/core/tests/tester.h b/libkdepim/komposer/core/tests/tester.h index 74ebd80d0..5981d681d 100644 --- a/libkdepim/komposer/core/tests/tester.h +++ b/libkdepim/komposer/core/tests/tester.h @@ -22,7 +22,7 @@ #define TESTER_H #include -#include +#include #define CHECK( x, y ) check( __FILE__, __LINE__, #x, x, y ) @@ -42,7 +42,7 @@ public: int testsFailed() const { return m_errorList.count(); } - QStringList errorList() const { + TQStringList errorList() const { return m_errorList; } @@ -52,8 +52,8 @@ protected: const T& result, const T& expectedResult ) { if ( result != expectedResult ) { - QString error; - QTextStream ts( &error, IO_WriteOnly ); + TQString error; + TQTextStream ts( &error, IO_WriteOnly ); ts << file << "["<< line <<"]:" <<" failed on \""<< str <<"\"" << "\ntests:\t\t result = " @@ -64,7 +64,7 @@ protected: ++m_tests; } private: - QStringList m_errorList; + TQStringList m_errorList; int m_tests; }; diff --git a/libkdepim/komposer/core/tests/testfactory.h b/libkdepim/komposer/core/tests/testfactory.h index 588941d8e..9354e52ad 100644 --- a/libkdepim/komposer/core/tests/testfactory.h +++ b/libkdepim/komposer/core/tests/testfactory.h @@ -23,7 +23,7 @@ #include "managertest.h" -#include +#include #define ADD_TEST(x) addTest( #x, new x ) @@ -40,15 +40,15 @@ public: { int result = 0; kdDebug()<<"Running tests..."< it( m_tests ); + TQAsciiDictIterator it( m_tests ); for( ; it.current(); ++it ) { Tester* test = it.current(); test->allTests(); - QStringList errorList = test->errorList(); + TQStringList errorList = test->errorList(); if ( !errorList.empty() ) { ++result; kdDebug()<< it.currentKey() <<" errors:" << endl; - for ( QStringList::Iterator itr = errorList.begin(); + for ( TQStringList::Iterator itr = errorList.begin(); itr != errorList.end(); ++itr ) { kdDebug()<< "\t" << (*itr).latin1() < m_tests; + TQAsciiDict m_tests; }; #endif diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index d73fb6e8c..8895cfe9e 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -11,19 +11,19 @@ using namespace Komposer; -TestManager::TestManager( QObject *parent ) - : QObject( parent ) +TestManager::TestManager( TQObject *parent ) + : TQObject( parent ) { m_manager = new PluginManager( this ); - connect( m_manager, SIGNAL(pluginLoaded(Plugin*)), - SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_manager, SIGNAL(allPluginsLoaded()), - SLOT(slotAllPluginsLoaded()) ); + connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), + TQT_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_manager, TQT_SIGNAL(allPluginsLoaded()), + TQT_SLOT(slotAllPluginsLoaded()) ); m_manager->loadAllPlugins(); - QValueList plugins = m_manager->availablePlugins(); + TQValueList plugins = m_manager->availablePlugins(); kdDebug()<<"Number of available plugins is "<< plugins.count() <::iterator it = plugins.begin(); it != plugins.end(); ++it ) { + for ( TQValueList::iterator it = plugins.begin(); it != plugins.end(); ++it ) { KPluginInfo *i = ( *it ); kdDebug()<<"\tAvailable plugin "<< i->name() <<", comment = "<< i->comment() < +#include namespace Komposer { class Plugin; @@ -13,7 +13,7 @@ class TestManager : public QObject { Q_OBJECT public: - TestManager( QObject *parent ); + TestManager( TQObject *parent ); public slots: void slotPluginLoaded( Plugin *plugin ); -- cgit v1.2.1