From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h | 5 +++-- kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/tests/logintest.h | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'kopete/protocols/yahoo/libkyahoo/tests') diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp index efcd63cf..6d8d9e0d 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp @@ -30,7 +30,7 @@ ClientStreamTest::~ClientStreamTest() void ClientStreamTest::slotDoTest() { - TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; myTestObject->connectToServer( server, true ); // fine up to here... diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h index 8842fcc2..e09c89bb 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h +++ b/kopete/protocols/yahoo/libkyahoo/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/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index 5e9b04a5..ecf96906 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp @@ -46,7 +46,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h index 68a40b24..1fd43976 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h @@ -32,11 +32,12 @@ #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); -- cgit v1.2.1