8 files changed, 13 insertions, 13 deletions
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index af23b51c..ab2bc683 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -251,12 +251,12 @@ public:
 	KopetePasswordSetRequest( Kopete::Password &pass, const TQString &newPass )
 	 : KopetePasswordRequest( 0, pass ), mNewPass( newPass )
 	{
-		if ( KApplication *app = KApplication::kApplication() )
+		if ( TDEApplication *app = TDEApplication::kApplication() )
 			app->ref();
 	}
 	~KopetePasswordSetRequest()
 	{
-		if ( KApplication *app = KApplication::kApplication() )
+		if ( TDEApplication *app = TDEApplication::kApplication() )
 			app->deref();
 		kdDebug( 14010 ) << k_funcinfo << "job complete" << endl;
 	}
@@ -315,12 +315,12 @@ public:
 	KopetePasswordClearRequest( Kopete::Password &pass )
 	 : KopetePasswordRequest( 0, pass )
 	{
-		if ( KApplication *app = KApplication::kApplication() )
+		if ( TDEApplication *app = TDEApplication::kApplication() )
 			app->ref();
 	}
 	~KopetePasswordClearRequest()
 	{
-		if ( KApplication *app = KApplication::kApplication() )
+		if ( TDEApplication *app = TDEApplication::kApplication() )
 			app->deref();
 		kdDebug( 14010 ) << k_funcinfo << "job complete" << endl;
 	}
diff --git a/kopete/libkopete/kopetepluginmanager.h b/kopete/libkopete/kopetepluginmanager.h
index 07982a98..ac1f86e2 100644
--- a/kopete/libkopete/kopetepluginmanager.h
+++ b/kopete/libkopete/kopetepluginmanager.h
@@ -198,7 +198,7 @@ private slots:
 	void slotShutdownTimeout();
 
 	/**
-	 * Common entry point to deref() the KApplication. Used both by the clean
+	 * Common entry point to deref() the TDEApplication. Used both by the clean
 	 * shutdown and the timeout condition of slotShutdownTimeout()
 	 */
 	void slotShutdownDone();
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 6fe46529..07e56734 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -83,7 +83,7 @@ bool isHostReachable(const TQString &host)
 	TQDataStream stream(params, IO_WriteOnly);
 	stream << host;
 
-	if ( KApplication::kApplication()->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && (replyType == "int") )
+	if ( TDEApplication::kApplication()->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && (replyType == "int") )
 	{
 		int result;
 		TQDataStream stream2( reply, IO_ReadOnly );
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index 1f8969f6..d86313d8 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -88,7 +88,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession
 			"\"%1\" has a maximum of %n arguments.", m_minArgs)
 			.arg( text() ), manager, gui );
 	}
-	else if( !KApplication::kApplication()->authorizeKAction( name() ) )
+	else if( !TDEApplication::kApplication()->authorizeKAction( name() ) )
 	{
 		printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui );
 	}
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index 50c023d9..08910d46 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -53,8 +53,8 @@ void KopeteEmoticonTest::allTests()
 	// change user data dir to avoid messing with user's .kde dir
 	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
-	//KApplication::disableAutoDcopRegistration();
-	//KApplication app;
+	//TDEApplication::disableAutoDcopRegistration();
+	//TDEApplication app;
 
 	testEmoticonParser();
 }
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index df675fa1..c2881d2f 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -64,7 +64,7 @@ KopeteMessage_Test::KopeteMessage_Test()
 
 void KopeteMessage_Test::allTests()
 {
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 	//TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
 
 	// At least Kopete::Message::asXML() seems to require that a TQApplication
@@ -72,7 +72,7 @@ void KopeteMessage_Test::allTests()
 	// version does.
 
 	if (!kapp)
-		new KApplication();
+		new TDEApplication();
 
 	testPrimitives();
 	testLinkParser();
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 039f4a39..df0dcc64 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -71,7 +71,7 @@ int main( int argc, char *argv[] )
 	TDECmdLineArgs::addCmdLineOptions( opts );
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	KApplication app( "kopetepasswordtest" );
+	TDEApplication app( "kopetepasswordtest" );
 
 	bool setPassword = args->isSet("set");
 	TQString newPwd = args->getOption("set");
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 49376651..092f59ff 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -65,7 +65,7 @@ int main( int argc, char *argv[] )
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption };
 	TDECmdLineArgs::addCmdLineOptions( opts );
-	KApplication app( "kopetewallettest" );
+	TDEApplication app( "kopetewallettest" );
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();