From ef71f46965855308db367f74956513eccc71bc46 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:21:16 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kopete/libkopete/tests/kopetemessage_test.cpp         | 2 +-
 kopete/libkopete/tests/kopetepasswordtest_program.cpp | 2 +-
 kopete/libkopete/tests/kopetewallettest_program.cpp   | 2 +-
 kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp   | 2 +-
 kopete/libkopete/tests/mock/kopeteprotocol_mock.h     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kopete/libkopete/tests')

diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index c2881d2f..ff18f587 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -53,7 +53,7 @@ KopeteMessage_Test::KopeteMessage_Test()
 	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	// create fake objects needed to build a reasonable testeable message
-	m_protocol = new Kopete::Test::Mock::Protocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
+	m_protocol = new Kopete::Test::Mock::Protocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
 	m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount");
 	m_metaContactMyself = new Kopete::Test::Mock::MetaContact();
 	m_metaContactOther = new Kopete::Test::Mock::MetaContact();
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index df0dcc64..63c9929d 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -66,7 +66,7 @@ void PasswordRetriever::timer()
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" );
+	TDEAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( opts );
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 092f59ff..63467d34 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -61,7 +61,7 @@ void WalletReciever::timer()
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" );
+	TDEAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption };
 	TDECmdLineArgs::addCmdLineOptions( opts );
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
index d9ae1d3a..5b2e3bed 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
@@ -24,7 +24,7 @@ namespace Test
 namespace Mock
 {
 
-Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
+Protocol::Protocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
 {
 	
 }
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
index d2502790..31418f66 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
@@ -20,7 +20,7 @@
 
 #include "kopeteprotocol.h"
 
-class KInstance;
+class TDEInstance;
 class TQObject;
 
 class KopeteEditAccountWidget;
@@ -37,7 +37,7 @@ namespace Mock
 class Protocol : public Kopete::Protocol
 {
 public:
-	Protocol( KInstance *instance, TQObject *parent, const char *name );
+	Protocol( TDEInstance *instance, TQObject *parent, const char *name );
 	// pure virtual functions implemented
 	virtual Account *createNewAccount( const TQString &accountId );
 	virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account );
-- 
cgit v1.2.1