summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar/tests
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/oscar/liboscar/tests
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/oscar/liboscar/tests')
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.h5
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ipaddrtest.h4
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.h9
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.h5
-rw-r--r--kopete/protocols/oscar/liboscar/tests/redirecttest.h4
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.h5
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.h5
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.h5
14 files changed, 40 insertions, 34 deletions
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index a7c16cea..6f62ebe6 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest()
void ClientStreamTest::slotDoTest()
{
- TQString server = TQString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
index 47aeac86..80c68446 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
@@ -19,11 +19,12 @@
#include "coreprotocol.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class ClientStreamTest : public QApplication
+class ClientStreamTest : public TQApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
ClientStreamTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
index f2fa0fec..6aff018c 100644
--- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
@@ -16,9 +16,9 @@
#include "oscarutils.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class IPAddrTest : public QApplication
+class IPAddrTest : public TQApplication
{
public:
IPAddrTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
index 2181fda3..d40f0069 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
@@ -62,7 +62,7 @@ KUnitTest::KUnitTest()
void KUnitTest::checkRun()
{
// if ( m_qtests.isEmpty() )
-// qApp->exit();
+// tqApp->exit();
}
int KUnitTest::runTests()
@@ -150,7 +150,7 @@ int KUnitTest::runTests()
return m_tests.count();
}
-//void KUnitTest::addTester( QTester *test )
+//void KUnitTest::addTester( TQTester *test )
//{
// m_qtests.insert( test, test );
// connect( test, TQT_SIGNAL(destroyed(TQObject*)),
@@ -161,7 +161,7 @@ void KUnitTest::qtesterDone( TQObject *obj )
{
// m_qtests.remove( obj );
// if ( m_qtests.isEmpty() )
-// qApp->quit();
+// tqApp->quit();
}
#include "kunittest.moc"
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h
index d2d6a04a..c2149992 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h
@@ -34,11 +34,12 @@
#include <tqptrdict.h>
#define ADD_TEST(x) addTester( #x, new x )
-#define ADD_QTEST(x) addTester( new x )
+#define ADD_TQTEST(x) addTester( new x )
-class KUnitTest : public QObject
+class KUnitTest : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KUnitTest();
@@ -48,7 +49,7 @@ public:
{
m_tests.insert( name, test );
}
-// void addTester( QTester *test );
+// void addTester( TQTester *test );
private slots:
void qtesterDone( TQObject *obj );
@@ -59,7 +60,7 @@ private:
private:
TQAsciiDict<Tester> m_tests;
-// TQPtrDict<QTester> m_qtests;
+// TQPtrDict<TQTester> m_qtests;
int globalTests;
int globalPasses;
int globalFails;
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
index 1d3728aa..540aa35c 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.h b/kopete/protocols/oscar/liboscar/tests/logintest.h
index d97c336d..661ae49d 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.h
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.h
@@ -20,11 +20,12 @@
#include "connection.h"
#include "coreprotocol.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class LoginTest : public QApplication
+class LoginTest : public TQApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.h b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
index 785d61c8..0989529c 100644
--- a/kopete/protocols/oscar/liboscar/tests/redirecttest.h
+++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
@@ -19,9 +19,9 @@
#include "serverredirecttask.h"
#include "task.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class RedirectTest : public QApplication
+class RedirectTest : public TQApplication
{
public:
RedirectTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index 6ca733cc..9849bbbb 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
void LoginTest::runAddGroupTest()
{
qDebug( "running ssi group add test" );
- TQString group = TQString::fromLatin1( "dummygroup" );
+ TQString group = TQString::tqfromLatin1( "dummygroup" );
myClient->addGroup( group );
TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
}
@@ -65,7 +65,7 @@ void LoginTest::runAddGroupTest()
void LoginTest::runDelGroupTest()
{
qDebug( "running ssi group del test" );
- TQString group = TQString::fromLatin1( "dummygroup" );
+ TQString group = TQString::tqfromLatin1( "dummygroup" );
myClient->removeGroup( group );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
index 291698ec..e997b9db 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
@@ -20,11 +20,12 @@
#include "connection.h"
#include "coreprotocol.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class LoginTest : public QApplication
+class LoginTest : public TQApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
index 7669a945..9c2202a6 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
@@ -53,28 +53,28 @@ void SSITest::testIt()
//try to find a group by name
ssi = m_manager->findGroup("SecondGroup");
if ( ssi )
- qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1());
+ qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( ssi->gid() ).latin1());
else
qDebug( "Oops, group SecondGroup not found" );
//try to find a group by gid
ssi = m_manager->findGroup( 3 );
if ( ssi )
- qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() );
+ qDebug( TQString("Found group 3 with name=%1").tqarg( ssi->name() ).latin1() );
else
qDebug( "Oops, group 3 not found" );
//try to find a contact by name
ssi = m_manager->findContact("ThirdContact");
if ( ssi )
- qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() );
+ qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( ssi->gid() ).latin1() );
else
qDebug( "Oops, contact ThirdContact not found" );
//try to find a contact using the name and the group name
ssi = m_manager->findContact("FourthContact","SecondGroup");
if ( ssi )
- qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
+ qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() );
else
qDebug( "Oops, contact FourthContact not found" );
@@ -89,13 +89,13 @@ void SSITest::testIt()
TQValueList<SSI*>::iterator it;
qDebug( "Contacts from group FirtsGroup:" );
for ( it = list.begin(); it != list.end(); ++it)
- qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() );
//the group list
TQValueList<SSI*> list2 = m_manager->groupList();
qDebug( "Group list:" );
for ( it = list2.begin(); it != list2.end(); ++it)
- qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() );
//remove a group - this shouldn't report any debug line
m_manager->removeGroup( "SecondGroup" );
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.h b/kopete/protocols/oscar/liboscar/tests/ssitest.h
index fbdcf2fb..db7e8697 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h
@@ -16,11 +16,12 @@
#include "ssimanager.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class SSITest : public QApplication
+class SSITest : public TQApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
SSITest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index fb346d26..663ec2fb 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
void LoginTest::runUserInfoTest()
{
qDebug( "running user info test" );
- TQString contact = TQString::fromLatin1( "userid" );
+ TQString contact = TQString::tqfromLatin1( "userid" );
myClient->requestFullInfo( contact );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
index 76450466..a17818e6 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
@@ -20,11 +20,12 @@
#include "connection.h"
#include "coreprotocol.h"
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
-class LoginTest : public QApplication
+class LoginTest : public TQApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
LoginTest(int argc, char ** argv);