Rename KApplication to TDEApplication to avoid conflicts with KDE4

10 files changed, 18 insertions, 18 deletions

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';