summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/tests
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete/tests')
-rwxr-xr-xkopete/libkopete/tests/create_test.rb2
-rw-r--r--kopete/libkopete/tests/kopetecontactlist_test.cpp2
-rw-r--r--kopete/libkopete/tests/kopeteemoticontest.cpp18
-rw-r--r--kopete/libkopete/tests/kopetemessage_test.cpp40
-rw-r--r--kopete/libkopete/tests/kopetepasswordtest_program.cpp6
-rw-r--r--kopete/libkopete/tests/kopetepasswordtest_program.h3
-rw-r--r--kopete/libkopete/tests/kopetepropertiestest.cpp4
-rw-r--r--kopete/libkopete/tests/kopetewallettest_program.cpp14
-rw-r--r--kopete/libkopete/tests/kopetewallettest_program.h3
-rw-r--r--kopete/libkopete/tests/mock/kopeteaccount_mock.cpp12
-rw-r--r--kopete/libkopete/tests/mock/kopeteaccount_mock.h14
-rw-r--r--kopete/libkopete/tests/mock/kopetecontact_mock.cpp6
-rw-r--r--kopete/libkopete/tests/mock/kopetecontact_mock.h8
-rw-r--r--kopete/libkopete/tests/mock/kopetemessage_mock.cpp4
-rw-r--r--kopete/libkopete/tests/mock/kopetemessage_mock.h6
-rw-r--r--kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp2
-rw-r--r--kopete/libkopete/tests/mock/kopetemetacontact_mock.h4
-rw-r--r--kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp12
-rw-r--r--kopete/libkopete/tests/mock/kopeteprotocol_mock.h12
19 files changed, 87 insertions, 85 deletions
diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb
index 7951bf35..ba6e0c2e 100755
--- a/kopete/libkopete/tests/create_test.rb
+++ b/kopete/libkopete/tests/create_test.rb
@@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,""))
fileCpp.gsub!(/Template/, className.gsub(/::/,""))
fileCpp.gsub!(/some requirement/, className + " class.")
-makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
+makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../tqmock/libkopete_tqmock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
makefileAm.gsub!(/template/, className.downcase.gsub(/::/,""))
hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,""))
diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp
index 7b21d407..933a67bb 100644
--- a/kopete/libkopete/tests/kopetecontactlist_test.cpp
+++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp
@@ -36,7 +36,7 @@ void KopeteContactList_Test::testSomething()
// change user data dir to avoid messing with user's .kde dir
setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
- TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) );
+ TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) );
if( ! filename.isEmpty() )
{
// previous test run, delete the previous contact list
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index a64aee99..ab0ee31a 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -62,7 +62,7 @@ void KopeteEmoticonTest::allTests()
void KopeteEmoticonTest::testEmoticonParser()
{
Kopete::Emoticons emo("Default");
- TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/emoticon-parser-testcases");
+ TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/emoticon-parser-testcases");
TQDir testCasesDir(basePath);
TQStringList inputFileNames = testCasesDir.entryList("*.input");
@@ -71,10 +71,10 @@ void KopeteEmoticonTest::testEmoticonParser()
TQString fileName = *it;
kdDebug() << "testcase: " << fileName << endl;
TQString outputFileName = fileName;
- outputFileName.replace("input","output");
+ outputFileName.tqreplace("input","output");
// open the input file
- TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName);
- TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName);
+ TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName);
+ TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName);
// check if the expected output file exists
// if it doesn't, skip the testcase
if ( ! expectedFile.exists() )
@@ -94,19 +94,19 @@ void KopeteEmoticonTest::testEmoticonParser()
inputFile.close();
expectedFile.close();
- TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString::null );
+ TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).tqreplace( "smile.png", TQString() );
Kopete::Emoticons::self();
- TQString result = emo.parse( inputData ).replace( path, TQString::null );
+ TQString result = emo.parse( inputData ).tqreplace( path, TQString() );
// HACK to know the test case we applied, concatenate testcase name to both
// input and expected string. WIll remove when I can add some sort of metadata
// to a CHECK so debug its origin testcase
- result = fileName + TQString::fromLatin1(": ") + result;
- expectedData = fileName + TQString::fromLatin1(": ") + expectedData;
+ result = fileName + TQString::tqfromLatin1(": ") + result;
+ expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData;
// if the test case begins with broken, we expect it to fail, then use XFAIL
// otherwise use CHECK
- if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") )
+ if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") )
{
kdDebug() << "checking known-broken testcase: " << fileName << endl;
XFAIL(result, expectedData);
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 3e4a85b3..55a44f87 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -29,11 +29,11 @@
#include <kdebug.h>
#include "kopetemessage_test.h"
-#include "kopeteaccount_mock.h"
-#include "kopeteprotocol_mock.h"
-#include "kopetecontact_mock.h"
-#include "kopetemetacontact_mock.h"
-#include "kopeteaccount_mock.h"
+#include "kopeteaccount_tqmock.h"
+#include "kopeteprotocol_tqmock.h"
+#include "kopetecontact_tqmock.h"
+#include "kopetemetacontact_tqmock.h"
+#include "kopeteaccount_tqmock.h"
using namespace KUnitTest;
@@ -57,9 +57,9 @@ KopeteMessage_Test::KopeteMessage_Test()
m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount");
m_metaContactMyself = new Kopete::Test::Mock::MetaContact();
m_metaContactOther = new Kopete::Test::Mock::MetaContact();
- m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-myself"), m_metaContactMyself, TQString::null);
- m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-dest"), m_metaContactOther, TQString::null);
- m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString::null, Kopete::Message::Outbound, Kopete::Message::PlainText);
+ m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-myself"), m_metaContactMyself, TQString());
+ m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-dest"), m_metaContactOther, TQString());
+ m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString(), Kopete::Message::Outbound, Kopete::Message::PlainText);
}
void KopeteMessage_Test::allTests()
@@ -67,7 +67,7 @@ void KopeteMessage_Test::allTests()
KApplication::disableAutoDcopRegistration();
//KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
- // At least Kopete::Message::asXML() seems to require that a QApplication
+ // At least Kopete::Message::asXML() seems to require that a TQApplication
// is created. Running the console version doesn't create it, but the GUI
// version does.
@@ -227,7 +227,7 @@ void KopeteMessage_Test::testPrimitives()
{
Kopete::Message msg2;
- CHECK(msg2.plainBody(), TQString::null);
+ CHECK(msg2.plainBody(), TQString());
msg2 = msg1;
@@ -251,7 +251,7 @@ void KopeteMessage_Test::setup()
void KopeteMessage_Test::testLinkParser()
{
- TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/link-parser-testcases");
+ TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/link-parser-testcases");
TQDir testCasesDir(basePath);
TQStringList inputFileNames = testCasesDir.entryList("*.input");
@@ -259,10 +259,10 @@ void KopeteMessage_Test::testLinkParser()
{
TQString fileName = *it;
TQString outputFileName = fileName;
- outputFileName.replace("input","output");
+ outputFileName.tqreplace("input","output");
// open the input file
- TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName);
- TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName);
+ TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName);
+ TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName);
// check if the expected output file exists
// if it doesn't, skip the testcase
if ( ! expectedFile.exists() )
@@ -283,12 +283,12 @@ void KopeteMessage_Test::testLinkParser()
expectedFile.close();
// use a concrete url
- inputData.replace( "$URL","http://www.kde.org" );
- expectedData.replace( "$URL","http://www.kde.org" );
+ inputData.tqreplace( "$URL","http://www.kde.org" );
+ expectedData.tqreplace( "$URL","http://www.kde.org" );
// set message format for parsing according to textcase filename convention
Kopete::Message::MessageFormat format;
- if ( fileName.section("-", 1, 1) == TQString::fromLatin1("plaintext") )
+ if ( fileName.section("-", 1, 1) == TQString::tqfromLatin1("plaintext") )
format = Kopete::Message::PlainText;
else
format = Kopete::Message::RichText;
@@ -298,11 +298,11 @@ void KopeteMessage_Test::testLinkParser()
// HACK to know the test case we applied, concatenate testcase name to both
// input and expected string. WIll remove when I can add some sort of metadata
// to a CHECK so debug its origin testcase
- result = fileName + TQString::fromLatin1(": ") + result;
- expectedData = fileName + TQString::fromLatin1(": ") + expectedData;
+ result = fileName + TQString::tqfromLatin1(": ") + result;
+ expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData;
// if the test case begins with broken, we expect it to fail, then use XFAIL
// otherwise use CHECK
- if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") )
+ if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") )
{
//kdDebug() << "checking known-broken testcase: " << fileName << endl;
XFAIL(result, expectedData);
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 51b8908a..ea298395 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -49,14 +49,14 @@ TQString retrieve( Password &pwd, const TQPixmap &image, const TQString &prompt
TQTimer tmr;
r.connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( timer() ) );
tmr.start( 1000 );
- qApp->exec();
+ tqApp->exec();
return r.password;
}
void PasswordRetriever::gotPassword( const TQString &pass )
{
password = pass;
- qApp->quit();
+ tqApp->quit();
}
void PasswordRetriever::timer()
@@ -101,7 +101,7 @@ int main( int argc, char *argv[] )
if ( newPwd.isEmpty() )
{
_out << "Clearing password" << endl;
- newPwd = TQString::null;
+ newPwd = TQString();
}
else
{
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.h b/kopete/libkopete/tests/kopetepasswordtest_program.h
index 47c17172..776374c1 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.h
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.h
@@ -3,9 +3,10 @@
#include <tqobject.h>
-class PasswordRetriever : public QObject
+class PasswordRetriever : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
TQString password;
public slots:
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index 76b8ae79..736bd2f8 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -51,8 +51,8 @@ void KopetePropertiesTest::allTests()
{
PropertyHost myPropertyHost;
CHECK( myPropertyHost.property(fooProperty).isNull(), true);
- myPropertyHost.setProperty( fooProperty, TQString::fromLatin1("Foo!") );
- CHECK( myPropertyHost.property(fooProperty), TQString::fromLatin1("Foo!") );
+ myPropertyHost.setProperty( fooProperty, TQString::tqfromLatin1("Foo!") );
+ CHECK( myPropertyHost.property(fooProperty), TQString::tqfromLatin1("Foo!") );
}
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index cfc8b6e9..b6eaf635 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -38,8 +38,8 @@ void closeWallet()
void delay()
{
- TQTimer::singleShot( 3000, qApp, TQT_SLOT( quit() ) );
- qApp->exec();
+ TQTimer::singleShot( 3000, tqApp, TQT_SLOT( quit() ) );
+ tqApp->exec();
}
void openWalletAsync()
@@ -76,9 +76,9 @@ int main( int argc, char *argv[] )
{
TQString arg = args->arg( i );
_out << "Processing " << arg << endl;
- if( arg == TQString::fromLatin1( "open" ) ) openWalletAsync();
- if( arg == TQString::fromLatin1( "close" ) ) closeWallet();
- if( arg == TQString::fromLatin1( "delay" ) ) delay();
+ if( arg == TQString::tqfromLatin1( "open" ) ) openWalletAsync();
+ if( arg == TQString::tqfromLatin1( "close" ) ) closeWallet();
+ if( arg == TQString::tqfromLatin1( "delay" ) ) delay();
_out << "Done." << endl;
}
@@ -89,8 +89,8 @@ int main( int argc, char *argv[] )
timer.start( 1000 );
_out << "About to start 30 second event loop" << endl;
- TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) );
- return qApp->exec();
+ TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
+ return tqApp->exec();
}
#include "kopetewallettest_program.moc"
diff --git a/kopete/libkopete/tests/kopetewallettest_program.h b/kopete/libkopete/tests/kopetewallettest_program.h
index b2e5d2fb..225fa6ad 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.h
+++ b/kopete/libkopete/tests/kopetewallettest_program.h
@@ -5,9 +5,10 @@
namespace KWallet { class Wallet; }
-class WalletReciever : public QObject
+class WalletReciever : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public slots:
void timer();
private slots:
diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
index 7d46fc34..35dde6b8 100644
--- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
@@ -1,5 +1,5 @@
/*
- Account mock object class
+ Account tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,9 +15,9 @@
*************************************************************************
*/
-#include "kopeteaccount_mock.h"
+#include "kopeteaccount_tqmock.h"
#include "kopetemetacontact.h"
-#include "kopeteaccount_mock.h"
+#include "kopeteaccount_tqmock.h"
namespace Kopete
{
@@ -26,7 +26,7 @@ namespace Test
namespace Mock
{
-Account::Account(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name)
+Account::Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name)
{
}
@@ -36,12 +36,12 @@ Account::~Account()
}
-bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact )
+bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact )
{
return true;
}
-void Account::connect( const Kopete::OnlineStatus& initialStatus)
+void Account::connect( const Kopete::OnlineStatus& initialtqStatus)
{
// do nothing
}
diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
index ac5a7253..93b1acdf 100644
--- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h
+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
@@ -1,5 +1,5 @@
/*
- Account mock object class
+ Account tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef _KOPETEACCOUNT_MOCK_H_
-#define _KOPETEACCOUNT_MOCK_H_
+#ifndef _KOPETEACCOUNT_TQMOCK_H_
+#define _KOPETEACCOUNT_TQMOCK_H_
#include "kopeteaccount.h"
@@ -36,13 +36,13 @@ namespace Mock
class Account : public Kopete::Account
{
public:
- Account(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L);
+ Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L);
~Account();
// pure virtual functions implementation
- virtual bool createContact( const TQString &contactId, MetaContact *parentContact );
- virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() );
+ virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact );
+ virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() );
virtual void disconnect();
- virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null );
+ virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() );
};
} // end ns Kopete::Test::Mock
diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
index ea90bee0..04f38727 100644
--- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
@@ -1,5 +1,5 @@
/*
- Contact mock object class
+ Contact tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,7 +15,7 @@
*************************************************************************
*/
-#include "kopetecontact_mock.h"
+#include "kopetecontact_tqmock.h"
namespace Kopete
{
@@ -24,7 +24,7 @@ namespace Test
namespace Mock
{
-Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon) : Kopete::Contact( account, id, parent, icon)
+Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon) : Kopete::Contact( account, id, tqparent, icon)
{
}
diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h
index faa78e3b..437887d9 100644
--- a/kopete/libkopete/tests/mock/kopetecontact_mock.h
+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h
@@ -1,5 +1,5 @@
/*
- Contact mock object class
+ Contact tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef _KOPETECONTACT_MOCK_H_
-#define _KOPETECONTACT_MOCK_H_
+#ifndef _KOPETECONTACT_TQMOCK_H_
+#define _KOPETECONTACT_TQMOCK_H_
#include "kopetecontact.h"
@@ -35,7 +35,7 @@ namespace Mock
class Contact : public Kopete::Contact
{
public:
- Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon = TQString::null );
+ Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon = TQString() );
~Contact();
virtual Kopete::ChatSession* manager( CanCreateFlags canCreate = CannotCreate );
};
diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
index a3e543e3..66f325e3 100644
--- a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
@@ -1,5 +1,5 @@
/*
- Message mock object class
+ Message tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,6 +15,6 @@
*************************************************************************
*/
-#include "kopetemessage_mock.h"
+#include "kopetemessage_tqmock.h"
diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h
index 13c92574..f8677ee6 100644
--- a/kopete/libkopete/tests/mock/kopetemessage_mock.h
+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h
@@ -1,5 +1,5 @@
/*
- Message mock object class
+ Message tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef _KOPETEMESSAGE_MOCK_H_
-#define _KOPETEMESSAGE_MOCK_H_
+#ifndef _KOPETEMESSAGE_TQMOCK_H_
+#define _KOPETEMESSAGE_TQMOCK_H_
#include "kopetemessage.h"
diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
index 32f0fe1c..e9cc95a1 100644
--- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
@@ -15,6 +15,6 @@
*************************************************************************
*/
-#include "kopetemetacontact_mock.h"
+#include "kopetemetacontact_tqmock.h"
diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
index f3311713..2fa6d8c6 100644
--- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef _KOPETEMETACONTACT_MOCK_H_
-#define _KOPETEMETACONTACT_MOCK_H_
+#ifndef _KOPETEMETACONTACT_TQMOCK_H_
+#define _KOPETEMETACONTACT_TQMOCK_H_
#include "kopetemetacontact.h"
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
index d9ae1d3a..03a65808 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
@@ -1,5 +1,5 @@
/*
- Protocol mock object class
+ Protocol tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,7 +15,7 @@
*************************************************************************
*/
-#include "kopeteprotocol_mock.h"
+#include "kopeteprotocol_tqmock.h"
namespace Kopete
{
@@ -24,7 +24,7 @@ namespace Test
namespace Mock
{
-Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
+Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name)
{
}
@@ -34,16 +34,16 @@ Account* Protocol::createNewAccount( const TQString &accountId )
return 0L;
}
-AddContactPage* Protocol::createAddContactWidget( TQWidget *parent, Kopete::Account *account )
+AddContactPage* Protocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *account )
{
return 0L;
}
-KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent )
+KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent )
{
return 0L;
}
-} // end ns mock
+} // end ns tqmock
} // end ns test
} // end ns kopete
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
index d2502790..86b551d5 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
@@ -1,5 +1,5 @@
/*
- Protocol mock object class
+ Protocol tqmock object class
Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef _KOPETEPROTOCOL_MOCK_H_
-#define _KOPETEPROTOCOL_MOCK_H_
+#ifndef _KOPETEPROTOCOL_TQMOCK_H_
+#define _KOPETEPROTOCOL_TQMOCK_H_
#include "kopeteprotocol.h"
@@ -37,11 +37,11 @@ namespace Mock
class Protocol : public Kopete::Protocol
{
public:
- Protocol( KInstance *instance, TQObject *parent, const char *name );
+ Protocol( KInstance *instance, TQObject *tqparent, const char *name );
// pure virtual functions implemented
virtual Account *createNewAccount( const TQString &accountId );
- virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account );
- virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent );
+ virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Kopete::Account *account );
+ virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent );
};
} // end ns Kopete::Test::Mock