summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar/tests
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar/liboscar/tests')
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp10
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ipaddrtest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.cpp30
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.h12
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/redirecttest.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/redirecttest.h8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp16
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.cpp24
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/tester.h32
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.h6
17 files changed, 102 insertions, 102 deletions
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index 59f392de..a7c16cea 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -2,7 +2,7 @@
#include "clientstream_test.h"
-ClientStreamTest::ClientStreamTest(int argc, char ** argv) : QApplication( argc, argv )
+ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,12 +10,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : QApplication( argc,
myConnector->setOptHostPort( "login.oscar.aol.com", 5190 );
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
// notify and start sending
- //connect( myTestObject, SIGNAL( warning(int) ), SLOT( slotWarning(int) ) );
+ //connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest()
void ClientStreamTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("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 32a0e3a9..47aeac86 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
@@ -10,9 +10,9 @@
#ifndef clientstream_test_h
#define clientstream_test_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
index 4f4e8df2..0f37f614 100644
--- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
@@ -2,11 +2,11 @@
#include <iostream>
#include "ipaddrtest.h"
-#include <qstring.h>
+#include <tqstring.h>
using namespace std;
IPAddrTest::IPAddrTest(int argc, char ** argv)
-: QApplication( argc, argv )
+: TQApplication( argc, argv )
{
}
@@ -28,13 +28,13 @@ bool IPAddrTest::testAllZeroDotted()
bool IPAddrTest::testNumericalIP()
{
- QString address = "65.93.151.168";
+ TQString address = "65.93.151.168";
return ( Oscar::getNumericalIP( address ) == 1096652712 );
}
bool IPAddrTest::testAllZeroNumerical()
{
- QString address = "0.0.0.0";
+ TQString address = "0.0.0.0";
return ( Oscar::getNumericalIP( address ) == 0 );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
index 9452ad82..f2fa0fec 100644
--- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
@@ -10,9 +10,9 @@
#ifndef IPADDRTEST_H
#define IPADDRTEST_H
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
index 9f7ba693..2181fda3 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
@@ -29,8 +29,8 @@
#include "tester.h"
#include "chatnavtests.h"
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include <iostream>
using namespace std;
@@ -51,7 +51,7 @@ void KUnitTest::registerTests()
KUnitTest::KUnitTest()
{
- QTimer::singleShot( 0, this, SLOT(checkRun()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(checkRun()) );
m_tests.setAutoDelete( TRUE );
// m_qtests.setAutoDelete( TRUE );
@@ -75,7 +75,7 @@ int KUnitTest::runTests()
int globalSkipped = 0;
cout << "# Running normal tests... #" << endl << endl;
- QAsciiDictIterator<Tester> it( m_tests );
+ TQAsciiDictIterator<Tester> it( m_tests );
for( ; it.current(); ++it ) {
Tester* test = it.current();
@@ -109,29 +109,29 @@ int KUnitTest::runTests()
if ( 0 < numXPass ) {
cout << " Unexpected pass" << ( ( 1 == numXPass )?"":"es") << ":" << endl;
- QStringList list = test->xpassList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->xpassList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < (numFail - numXFail) ) {
cout << " Unexpected failure" << ( ( 1 == numFail )?"":"s") << ":" << endl;
- QStringList list = test->errorList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->errorList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < numXFail ) {
cout << " Expected failure" << ( ( 1 == numXFail)?"":"s") << ":" << endl;
- QStringList list = test->xfailList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->xfailList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < numSkip ) {
cout << " Skipped test" << ( ( 1 == numSkip )?"":"s") << ":" << endl;
- QStringList list = test->skipList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->skipList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
@@ -153,11 +153,11 @@ int KUnitTest::runTests()
//void KUnitTest::addTester( QTester *test )
//{
// m_qtests.insert( test, test );
-// connect( test, SIGNAL(destroyed(QObject*)),
-// SLOT(qtesterDone(QObject* )) );
+// connect( test, TQT_SIGNAL(destroyed(TQObject*)),
+// TQT_SLOT(qtesterDone(TQObject* )) );
//}
-void KUnitTest::qtesterDone( QObject *obj )
+void KUnitTest::qtesterDone( TQObject *obj )
{
// m_qtests.remove( obj );
// if ( m_qtests.isEmpty() )
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h
index 5148a82a..d2d6a04a 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h
@@ -29,9 +29,9 @@
#include "tester.h"
-#include <qobject.h>
-#include <qasciidict.h>
-#include <qptrdict.h>
+#include <tqobject.h>
+#include <tqasciidict.h>
+#include <tqptrdict.h>
#define ADD_TEST(x) addTester( #x, new x )
#define ADD_QTEST(x) addTester( new x )
@@ -51,15 +51,15 @@ public:
// void addTester( QTester *test );
private slots:
- void qtesterDone( QObject *obj );
+ void qtesterDone( TQObject *obj );
void checkRun();
private:
void registerTests();
private:
- QAsciiDict<Tester> m_tests;
-// QPtrDict<QTester> m_qtests;
+ TQAsciiDict<Tester> m_tests;
+// TQPtrDict<QTester> 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 6dbc9646..1d3728aa 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -2,7 +2,7 @@
#include "logintest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("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 898a3d99..d97c336d 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.h
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp b/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
index a220e13e..3086ca64 100644
--- a/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
@@ -2,11 +2,11 @@
#include <iostream>
#include "redirecttest.h"
-#include <qcstring.h>
+#include <tqcstring.h>
using namespace std;
RedirectTest::RedirectTest(int argc, char ** argv)
-: QApplication( argc, argv ),
+: TQApplication( argc, argv ),
m_transfer(0),
m_task(0)
{
@@ -73,7 +73,7 @@ bool RedirectTest::testCookieIsSet()
return !m_task->cookie().isEmpty();
}
-Buffer* RedirectTest::SetupBuffer(WORD Service, QString Cookie)
+Buffer* RedirectTest::SetupBuffer(WORD Service, TQString Cookie)
{
Buffer* b = new Buffer;
b->addTLV16(0x000D, Service);
diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.h b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
index eda5d67a..785d61c8 100644
--- a/kopete/protocols/oscar/liboscar/tests/redirecttest.h
+++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
@@ -10,9 +10,9 @@
#ifndef RedirectTest_h
#define RedirectTest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "transfer.h"
#include "oscartypes.h"
@@ -39,7 +39,7 @@ public:
private:
//Helper functions
- Buffer* SetupBuffer(WORD Service, QString Cookie);
+ Buffer* SetupBuffer(WORD Service, TQString Cookie);
Task *m_root;
SnacTransfer * m_transfer;
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index a1a9e754..6ca733cc 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -2,7 +2,7 @@
#include "ssigrouptest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,14 +29,14 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myClient->setIsIcq( true );
myClient->start( server, 5190, "userid", "password" );
myClient->connectToServer( myConnection, server, true );
- QTimer::singleShot( 10000, this, SLOT(runAddGroupTest() ) );
+ TQTimer::singleShot( 10000, this, TQT_SLOT(runAddGroupTest() ) );
connected = true;
}
@@ -57,15 +57,15 @@ int main(int argc, char ** argv)
void LoginTest::runAddGroupTest()
{
qDebug( "running ssi group add test" );
- QString group = QString::fromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->addGroup( group );
- QTimer::singleShot( 5000, this, SLOT( runDelGroupTest() ) );
+ TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
}
void LoginTest::runDelGroupTest()
{
qDebug( "running ssi group del test" );
- QString group = QString::fromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->removeGroup( group );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
index 361c053b..291698ec 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
index d8e05b36..7669a945 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
@@ -2,9 +2,9 @@
#include "ssitest.h"
-#include <qstring.h>
+#include <tqstring.h>
-SSITest::SSITest(int argc, char ** argv) : QApplication( argc, argv )
+SSITest::SSITest(int argc, char ** argv) : TQApplication( argc, argv )
{
m_manager = new SSIManager(this);
@@ -19,7 +19,7 @@ SSITest::~SSITest()
void SSITest::testIt()
{
- QPtrList<TLV> tlvs;
+ TQPtrList<TLV> tlvs;
//add three groups
SSI *ssi = new SSI( "FirstGroup", 1, 1, ROSTER_GROUP, tlvs);
@@ -53,28 +53,28 @@ void SSITest::testIt()
//try to find a group by name
ssi = m_manager->findGroup("SecondGroup");
if ( ssi )
- qDebug( QString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1());
+ qDebug( TQString("Found group SecondGroup with gid=%1").arg( 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( QString("Found group 3 with name=%1").arg( ssi->name() ).latin1() );
+ qDebug( TQString("Found group 3 with name=%1").arg( 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( QString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() );
+ qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( 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( QString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
+ qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
else
qDebug( "Oops, contact FourthContact not found" );
@@ -85,17 +85,17 @@ void SSITest::testIt()
qDebug( "Good! It has detected the group is invalid :)" );
//contacts from a group
- QValueList<SSI*> list = m_manager->contactsFromGroup("FirstGroup");
- QValueList<SSI*>::iterator it;
+ TQValueList<SSI*> list = m_manager->contactsFromGroup("FirstGroup");
+ TQValueList<SSI*>::iterator it;
qDebug( "Contacts from group FirtsGroup:" );
for ( it = list.begin(); it != list.end(); ++it)
- qDebug( QString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
//the group list
- QValueList<SSI*> list2 = m_manager->groupList();
+ TQValueList<SSI*> list2 = m_manager->groupList();
qDebug( "Group list:" );
for ( it = list2.begin(); it != list2.end(); ++it)
- qDebug( QString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*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 19206465..fbdcf2fb 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h
@@ -10,9 +10,9 @@
#ifndef ssitest_h
#define ssitest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "ssimanager.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/tester.h b/kopete/protocols/oscar/liboscar/tests/tester.h
index 2cb1f3af..162473dd 100644
--- a/kopete/protocols/oscar/liboscar/tests/tester.h
+++ b/kopete/protocols/oscar/liboscar/tests/tester.h
@@ -27,7 +27,7 @@
#ifndef TESTER_H
#define TESTER_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
#define CHECK( x, y ) check( __FILE__, __LINE__, #x, x, y, false )
#define XFAIL( x, y ) check( __FILE__, __LINE__, #x, x, y, true )
@@ -50,26 +50,26 @@ public:
return m_tests;
}
- QStringList errorList() const {
+ TQStringList errorList() const {
return m_errorList;
}
- QStringList xfailList() const {
+ TQStringList xfailList() const {
return m_xfailList;
}
- QStringList xpassList() const {
+ TQStringList xpassList() const {
return m_xpassList;
}
- QStringList skipList() const {
+ TQStringList skipList() const {
return m_skipList;
}
- void skip( const char *file, int line, QString msg )
+ void skip( const char *file, int line, TQString msg )
{
- QString skipEntry;
- QTextStream ts( &skipEntry, IO_WriteOnly );
+ TQString skipEntry;
+ TQTextStream ts( &skipEntry, IO_WriteOnly );
ts << file << "["<< line <<"]: " << msg;
m_skipList.append( skipEntry );
@@ -83,8 +83,8 @@ protected:
bool expectedFailure )
{
if ( result != expectedResult ) {
- QString error;
- QTextStream ts( &error, IO_WriteOnly );
+ TQString error;
+ TQTextStream ts( &error, IO_WriteOnly );
ts << file << "["<< line <<"]:"
<<" failed on \""<< str <<"\""
<< "\n\t\t result = '"
@@ -99,8 +99,8 @@ protected:
// then the test passed, but we want to record it if
// we were expecting a failure
if (expectedFailure) {
- QString error;
- QTextStream ts( &error, IO_WriteOnly );
+ TQString error;
+ TQTextStream ts( &error, IO_WriteOnly );
ts << file << "["<< line <<"]:"
<<" unexpectedly passed on \""
<< str <<"\"";
@@ -111,10 +111,10 @@ protected:
}
private:
- QStringList m_errorList;
- QStringList m_xfailList;
- QStringList m_xpassList;
- QStringList m_skipList;
+ TQStringList m_errorList;
+ TQStringList m_xfailList;
+ TQStringList m_xpassList;
+ TQStringList m_skipList;
int m_tests;
};
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index 72ef5acb..fb346d26 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -2,7 +2,7 @@
#include "userinfotest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,15 +29,15 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myClient->setIsIcq( true );
myClient->start( server, 5190, "userid", "password" );
myClient->connectToServer( myConnection, server, true );
- //QObject::connect( myClient, SIGNAL( userIsOnline( const QString& ) ), this, SLOT( runUserInfoTest()));
- //QTimer::singleShot( 6000, this, SLOT(runUserInfoTest() ) );
+ //TQObject::connect( myClient, TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( runUserInfoTest()));
+ //TQTimer::singleShot( 6000, this, TQT_SLOT(runUserInfoTest() ) );
connected = true;
}
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
void LoginTest::runUserInfoTest()
{
qDebug( "running user info test" );
- QString contact = QString::fromLatin1( "userid" );
+ TQString contact = TQString::fromLatin1( "userid" );
myClient->requestFullInfo( contact );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
index 433a6c48..76450466 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"