Rename KApplication to TDEApplication to avoid conflicts with KDE4

22 files changed, 37 insertions, 37 deletions

diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 7e6e3132..f779dcfa 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -183,9 +183,9 @@ void ChatWindowStyleRendering_Test::allTests()
 	// change user data dir to avoid messing with user's .kde dir
 	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 	//TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
-	KApplication app;
+	TDEApplication app;
 
 	chatPart = new ChatMessagePart(d->fakeChatSession, 0, 0);
 
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index ef8160c1..4c37e059 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -71,7 +71,7 @@ KopeteApplication::KopeteApplication()
 	 * When the messagebox is finished the loop_level will drop down to zero and
 	 * TQApplication thinks the application shuts down (this is usually the case
 	 * when the loop_level goes down to zero) . So it emits aboutToQuit(), to
-	 * which KApplication is connected and re-emits shutdown() , to which again
+	 * which TDEApplication is connected and re-emits shutdown() , to which again
 	 * KMainWindow (a KopeteWindow instance exists already) is connected. KMainWindow's
 	 * shuttingDown() slot calls queryExit() which results in KopeteWindow::queryExit()
 	 * calling unloadPlugins() . This of course is wrong and just shouldn't happen.
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index e3410a5b..87581866 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -112,8 +112,8 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event )
  *                shuts down the PluginManager in queryExit().  When the PluginManager has completed its
  *                shutdown, the app is finally deref()ed, and the contactlist and accountmanager
  *                are saved.
- *                and calling KApplication::quit()
- * 2) session   - KopeteWindow and all chatwindows are closed by KApplication session management.
+ *                and calling TDEApplication::quit()
+ * 2) session   - KopeteWindow and all chatwindows are closed by TDEApplication session management.
  *     quit        Then the shutdown proceeds as above.
  *
  * queryClose() is honoured so group chats and chats receiving recent messages can interrupt
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();
 
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index 46739d0d..f1215602 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -33,7 +33,7 @@ int main( int argc, char** argv ) {
 
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDEApplication app;
 
     KUnitTest::Runner::registerTester("ClientTest", new ClientTest);
 
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 6d6c2ba2..dbe0bfb2 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -44,7 +44,7 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
 {
 	d = new KSSLSocketPrivate;
 	d->kssl = 0;
-	d->dcc = KApplication::kApplication()->dcopClient();
+	d->dcc = TDEApplication::kApplication()->dcopClient();
 	d->cc = new KSSLCertificateCache;
 	d->cc->reload();
 
@@ -186,7 +186,7 @@ void KSSLSocket::showInfoDialog()
 	{
 		if (!d->dcc->isApplicationRegistered("kio_uiserver"))
 		{
-			KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+			TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
 		}
 
 		TQByteArray data, ignore;
@@ -235,7 +235,7 @@ int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString
 
 	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
 	{
-		KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
 	}
 
 	d->dcc->call("kio_uiserver", "UIServer",
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
index 3a8b6d88..2dc7f5ff 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
@@ -380,7 +380,7 @@ extern "C"
 
 int kdemain ( int argc, char **argv )
 {
-	KApplication app(argc, argv, "kio_jabberdisco", false, true);
+	TDEApplication app(argc, argv, "kio_jabberdisco", false, true);
 
 	kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl;
 
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 5791c58d..a92f620e 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -238,7 +238,7 @@ void AIMContact::userInfoUpdated( const TQString& contact, const UserDetails& de
         if ( !mAccount->engine()->hasIconConnection() )
             mAccount->engine()->requestServerRedirect( 0x0010 );
 
-		int time = ( KApplication::random() % 10 ) * 1000;
+		int time = ( TDEApplication::random() % 10 ) * 1000;
 		kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl;
 		TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) );
 	}
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index e4943c37..c54e4ffb 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -190,7 +190,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 			}
 			else
 			{
-				int time = ( KApplication::random() % 10 ) * 1000;
+				int time = ( TDEApplication::random() % 10 ) * 1000;
 				kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in "
 				                         << time/1000 << " seconds" << endl;
 				TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) );
@@ -235,7 +235,7 @@ void ICQContact::loggedIn()
 	     !m_requestingNickname && m_ssiItem.alias().isEmpty() )
 	{
 		m_requestingNickname = true;
-		int time = ( KApplication::random() % 20 ) * 1000;
+		int time = ( TDEApplication::random() % 20 ) * 1000;
 		kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating nickname in " << time/1000 << " seconds" << endl;
 		TQTimer::singleShot( time, this, TQT_SLOT( requestShortInfo() ) );
 	}
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index 3e649b97..ec45b36c 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -63,8 +63,8 @@ void ChatServiceTask::onGo()
     kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "sending '" << m_message.textArray() << "' to the "
                              << m_room << " room" << endl;
     Buffer* b = new Buffer();
-    b->addDWord( KApplication::random() ); //use kapp since it's convenient
-    b->addDWord( KApplication::random() );
+    b->addDWord( TDEApplication::random() ); //use kapp since it's convenient
+    b->addDWord( TDEApplication::random() );
     b->addWord( 0x0003 ); //this be message channel 3 mateys! arrr!!
     b->addDWord( 0x00010000 ); //TLV 1 - this means it's a public message
     b->addDWord( 0x00060000 ); //TLV 6 - enables the server sending you your message back
diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp
index b94a9082..80bfa8d6 100644
--- a/kopete/protocols/oscar/liboscar/connection.cpp
+++ b/kopete/protocols/oscar/liboscar/connection.cpp
@@ -207,8 +207,8 @@ void Connection::forcedSend( Transfer* request ) const
 
 void Connection::initSequence()
 {
-	d->snacSequence = ( KApplication::random() & 0xFFFF );
-	d->flapSequence = ( KApplication::random() & 0xFFFF );
+	d->snacSequence = ( TDEApplication::random() & 0xFFFF );
+	d->flapSequence = ( TDEApplication::random() & 0xFFFF );
 }
 
 void Connection::distribute( Transfer * transfer ) const
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index df1a8193..3856a994 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -65,8 +65,8 @@ void SendMessageTask::onGo()
 
 	if ( snacSubfamily == 0x0006 )
 	{
-		DWORD cookie1 = KApplication::random();
-		DWORD cookie2 = KApplication::random();
+		DWORD cookie1 = TDEApplication::random();
+		DWORD cookie2 = TDEApplication::random();
 		
 		b->addDWord( cookie1 );
 		b->addDWord( cookie2 );
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 8efe247a..c408d0ad 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -111,7 +111,7 @@ bool WinPopupLib::checkMessageDir()
 												  TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
 		if (tmpYesNo == KMessageBox::Yes) {
 			TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
-			if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
+			if (TDEApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
 		}
 	} else {
 		KFileItem tmpFileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(WP_POPUP_DIR));
@@ -130,7 +130,7 @@ bool WinPopupLib::checkMessageDir()
 													  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 			if (tmpYesNo == KMessageBox::Yes) {
 				TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
-				if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
+				if (TDEApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
 			}
 		} else {
 			return true;
@@ -306,7 +306,7 @@ void WinPopupLib::readMessages(const KFileItemList &items)
 															  TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
 					if (tmpYesNo == KMessageBox::Yes) {
 						TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
-						if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
+						if (TDEApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
 							if (!messageFile.remove())
 								KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Still cannot remove it; please fix manually."));
 						}
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 91145338..8e21a16d 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -140,7 +140,7 @@ void WPProtocol::installSamba()
 	TQStringList args;
 	args += KStandardDirs::findExe("winpopup-install.sh");
 	args += KStandardDirs::findExe("winpopup-send.sh");
-	if (KApplication::tdeinitExecWait("tdesu", args) == 0)
+	if (TDEApplication::tdeinitExecWait("tdesu", args) == 0)
 		KMessageBox::information(Kopete::UI::Global::mainWidget(), i18n("The Samba configuration file is modified."), i18n("Configuration Succeeded"));
 	else
 		KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Updating the Samba configuration file failed."), i18n("Configuration Failed"));
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 8c277525..4b5ca8a7 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -311,7 +311,7 @@ TQString SendFileTask::newYahooTransferId()
 
 	for(int i = 0; i < 22; i++)
 	{
-		char j = KApplication::random() % 61;
+		char j = TDEApplication::random() % 61;
 
 		if(j < 26)
 			newId += j + 'a';