7 files changed, 13 insertions, 13 deletions
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index a35dc5bc..6cdfedbd 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -172,7 +172,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		}
 		else
 		{
-			KInstance *instance;
+			TDEInstance *instance;
 
 			if ( m_parentCollection )
 			instance = m_parentCollection->instance();
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 9d8ba1bf..ed05e036 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -112,11 +112,11 @@ void KopeteRichTextEditPart::createActions()
 	createActions( actionCollection() );
 }
 
-KAboutData *KopeteRichTextEditPart::createAboutData()
+TDEAboutData *KopeteRichTextEditPart::createAboutData()
 {
-	KAboutData *aboutData = new KAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1",
+	TDEAboutData *aboutData = new TDEAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1",
 						I18N_NOOP("A simple rich text editor part for Kopete"),
-						KAboutData::License_LGPL );
+						TDEAboutData::License_LGPL );
 	aboutData->addAuthor("Richard J. Moore", 0, "rich@kde.org", "http://xmelegance.org/" );
 	aboutData->addAuthor("Jason Keirstead", 0, "jason@keirstead.org", "http://www.keirstead.org/" );
 	return aboutData;
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h
index c560145e..32050cd6 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.h
+++ b/kopete/kopete/chatwindow/krichtexteditpart.h
@@ -8,7 +8,7 @@
 #include <tqfont.h>
 #include <tqcolor.h>
 
-class KAboutData;
+class TDEAboutData;
 class KTextEdit;
 class KFontAction;
 class KFontSizeAction;
@@ -51,7 +51,7 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
 
 		bool buttonsEnabled() { return !m_richTextAvailable || m_richTextEnabled; }
 
-		static KAboutData *createAboutData();
+		static TDEAboutData *createAboutData();
 
 		virtual bool openFile() { return false; };
 
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index f779dcfa..fad57bb2 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -61,7 +61,7 @@ public:
 class FakeProtocol : public Kopete::Protocol
 {
 public:
-FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
+FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
 {
 	
 }
@@ -122,7 +122,7 @@ class ChatWindowStyleRendering_Test::Private
 public:
 	Private()
 	{
-		protocol = new FakeProtocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
+		protocol = new FakeProtocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
 		account = new FakeAccount(protocol, TQString("testaccount"), 0);
 
 		// Create fake meta/contacts
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 8bce4350..4ce921aa 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -714,7 +714,7 @@ public:
 class FakeProtocol : public Kopete::Protocol
 {
 public:
-FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){}
+FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){}
 Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;}
 AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;}
 KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;}
@@ -735,7 +735,7 @@ void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/
 
 void AppearanceConfig::createPreviewChatSession()
 {
-	d->previewProtocol = new FakeProtocol( new KInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle");
+	d->previewProtocol = new FakeProtocol( new TDEInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle");
 	d->previewAccount = new FakeAccount(d->previewProtocol, TQString("previewaccount"), 0);
 
 	// Create fake meta/contacts
diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp
index c0a556e7..d56dfc76 100644
--- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp
+++ b/kopete/kopete/kconf_update/kopete-nameTracking.cpp
@@ -24,7 +24,7 @@ static TQTextStream qcerr( stderr, IO_WriteOnly );
 
 int main()
 {
-	KInstance* inst = new KInstance( "Update script" );
+	TDEInstance* inst = new TDEInstance( "Update script" );
 	TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) );
 	
 	// Load contact list & save backup.
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index eaa0ff68..679277ad 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kopete", I18N_NOOP("Kopete"),
-		KOPETE_VERSION_STRING, description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "kopete", I18N_NOOP("Kopete"),
+		KOPETE_VERSION_STRING, description, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2009-2010, Timothy Pearson\n(c) 2001-2004, Duncan Mac-Vicar Prett\n(c) 2002-2005, Kopete Development Team"), "kopete-devel@kde.org", "http://kopete.kde.org");
 
 	aboutData.addAuthor ( "Duncan Mac-Vicar Prett", I18N_NOOP("Developer and Project founder"), "duncan@kde.org", "http://www.mac-vicar.org/~duncan" );