Rename KApplication to TDEApplication to avoid conflicts with KDE4

52 files changed, 90 insertions, 90 deletions

diff --git a/dcoprss/client.cpp b/dcoprss/client.cpp
index f84fc0f9..01b6003e 100644
--- a/dcoprss/client.cpp
+++ b/dcoprss/client.cpp
@@ -14,7 +14,7 @@ class rssIface : virtual public DCOPObject
 	K_DCOP
 public:
 
-	rssIface( KApplication *app)
+	rssIface( TDEApplication *app)
 	{
 		// get our DCOP client and attach so that we may use it
 		DCOPClient *client = app->dcopClient();
@@ -25,7 +25,7 @@ public:
 		if (!client->isApplicationRegistered("rssservice"))
 		{
 			kdDebug() << "Could not find service so I am starting it..." << endl;
-			if(KApplication::startServiceByName("rssservice",TQStringList(), &error, &appID ))
+			if(TDEApplication::startServiceByName("rssservice",TQStringList(), &error, &appID ))
 			{
 				kdDebug() << "Starting rssservice failed with message: " << error << endl;
 				exit(0);
@@ -69,7 +69,7 @@ public:
 */
 int main(int argc, char **argv)
 {
-	KApplication *app = new KApplication(argc, argv, "client", false);
+	TDEApplication *app = new TDEApplication(argc, argv, "client", false);
 
 	app->exec();
 }
diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index 4a12dac5..84ccf5d9 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -134,7 +134,7 @@ int main( int argc, char **argv )
 	KGlobal::locale()->setMainCatalogue( "dcoprss" );
 	KAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app;
+	TDEApplication app;
 	FeedBrowserDlg *dlg = new FeedBrowserDlg( 0 );
 	app.setMainWidget( dlg );
 	dlg->show();
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 7cec38c9..054bf953 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -278,7 +278,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data)
 
   DCOPClient *client = kapp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
-    KApplication::startServiceByDesktopName("kdict");
+    TDEApplication::startServiceByDesktopName("kdict");
     waiting = 1;
     delayedFunc = fun.copy();
     delayedData = data;
diff --git a/kdnssd/ioslave/dnssd.cpp b/kdnssd/ioslave/dnssd.cpp
index 0f16008e..e94b7303 100644
--- a/kdnssd/ioslave/dnssd.cpp
+++ b/kdnssd/ioslave/dnssd.cpp
@@ -351,12 +351,12 @@ extern "C"
 {
 	int KDE_EXPORT kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_zeroconf", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication::disableAutoDcopRegistration();
-		KApplication app;
+		TDEApplication::disableAutoDcopRegistration();
+		TDEApplication app;
 		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 		ZeroConfProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
 		slave.dispatchLoop();
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index 535393b0..fccb2130 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -119,7 +119,7 @@ void KGetLinkView::slotStartLeech()
 
         if ( !p_dcopServer->isApplicationRegistered( "kget" ) )
         {
-            KApplication::startServiceByDesktopName( "kget" );
+            TDEApplication::startServiceByDesktopName( "kget" );
         }
         kapp->updateRemoteUserTimestamp( "kget" );
 
diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp
index 41a7025e..8263c202 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.cpp
+++ b/knewsticker/knewstickerstub/knewstickerstub.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::addCmdLineOptions(options);
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	
-	KApplication app(false, false);
+	TDEApplication app(false, false);
 
 	DCOPClient *dcopClient = app.dcopClient();
 	dcopClient->attach();
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index df824c4a..df4ede38 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -308,7 +308,7 @@ void NewsScroller::mouseMoveEvent(TQMouseEvent *e)
 		else
 			dragDistance = TQABS(e->y() - m_dragPos.y());
 		m_mouseDrag = (e->state() & Qt::LeftButton != 0) &&
-			dragDistance >= KGlobal::config()->readNumEntry("StartDragDist", KApplication::startDragDistance());
+			dragDistance >= KGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance());
 		if (m_mouseDrag) // Stop the scroller if we just started a drag.
 			m_scrollTimer->stop();
 	} else	{
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';
diff --git a/kppp/ChangeLog b/kppp/ChangeLog
index e3657e16..8aea4f64 100644
--- a/kppp/ChangeLog
+++ b/kppp/ChangeLog
@@ -124,7 +124,7 @@
 
 	* don't ignore SIGHUP anymore. Forbidding Ctrl-Z is crazy.
 	* a bit more respect for Session Managment by adding handlers
-	  for KApplication::saveYourSelf() and shutDown(). A user
+	  for TDEApplication::saveYourSelf() and shutDown(). A user
           had reported corrupted config data.
 	* made 'Log' a toggle button to represent debug window state
 
@@ -1182,7 +1182,7 @@
 	* replaced klocale->translate() with i18n() and every reference to
 	XPPP with KPPP
 	* utilize �kapp� (defined in kapp.h) instead of the global �extern
-	KApplication *app�
+	TDEApplication *app�
 	(Sorry about the large amount of changes, but I couldn�t resist to 
         clean up the code)
 
@@ -1344,7 +1344,7 @@ Wed Mar 18 01:13:50 1998  Harri Porten  <[email protected]>
 
 Mon Mar 16 03:37:04 1998  Bernd Johannes Wuebben  <[email protected]>
 
-	* command line options need to be parse after creating a KApplications
+	* command line options need to be parse after creating a TDEApplications
 	due to some changes by Matthias in kapp I think.
 
 1998-03-15  Mario Weilguni  <[email protected]>
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 3d1515f7..89058d94 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -274,9 +274,9 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 	  this, TQT_SLOT(startAccounting()));
   connect(con, TQT_SIGNAL(stopAccounting()),
 	  this, TQT_SLOT(stopAccounting()));
-  connect(KApplication::kApplication(), TQT_SIGNAL(saveYourself()),
+  connect(TDEApplication::kApplication(), TQT_SIGNAL(saveYourself()),
 	  this, TQT_SLOT(saveMyself()));
-  connect(KApplication::kApplication(), TQT_SIGNAL(shutDown()),
+  connect(TDEApplication::kApplication(), TQT_SIGNAL(shutDown()),
 	  this, TQT_SLOT(shutDown()));
 
   debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55,
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index bd56c7fe..4d0bba30 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
 
   TDECmdLineArgs::addCmdLineOptions( option );
 
-  KApplication a;
+  TDEApplication a;
 
   loadLogs();
 
diff --git a/kppp/main.cpp b/kppp/main.cpp
index d922c4c5..93f31f6d 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -212,7 +212,7 @@ int main( int argc, char **argv ) {
 
 
 
-  KApplication a;
+  TDEApplication a;
 
   // set portable locale for decimal point
   setlocale(LC_NUMERIC ,"C");
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 5417a1a2..990a1088 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -191,7 +191,7 @@ void MiniTerm::cancelbutton() {
 
   statusbar->setText(i18n("Hanging up..."));
   kapp->processEvents();
-  KApplication::flushX();
+  TDEApplication::flushX();
 
   Modem::modem->hangup();
 
@@ -206,7 +206,7 @@ void MiniTerm::resetModem() {
   statusbar->setText(i18n("Resetting Modem"));
   terminal->newLine();
   kapp->processEvents();
-  KApplication::flushX();
+  TDEApplication::flushX();
 
   Modem::modem->hangup();
 
diff --git a/krdc/main.cpp b/krdc/main.cpp
index daf6d38d..e21c0dfa 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	KApplication a;
+	TDEApplication a;
 
 	TQString host = TQString();
 	Quality quality = QUALITY_UNKNOWN;
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 	return mc.main();
 }
 
-MainController::MainController(KApplication *app, WindowMode wm,
+MainController::MainController(TDEApplication *app, WindowMode wm,
 			       const TQString &host,
 			       Quality quality,
 			       const TQString &encodings,
diff --git a/krdc/main.h b/krdc/main.h
index 95593651..39aa7690 100644
--- a/krdc/main.h
+++ b/krdc/main.h
@@ -23,7 +23,7 @@
 #include "kremoteview.h"
 #include "smartptr.h"
 
-class KApplication;
+class TDEApplication;
 
 class MainController : public TQObject {
 	Q_OBJECT
@@ -38,10 +38,10 @@ private:
 	TQString m_keymap;
 	Quality m_quality;
 
-	KApplication *m_app;
+	TDEApplication *m_app;
 
 public:
-	MainController(KApplication *app, WindowMode wm,
+	MainController(TDEApplication *app, WindowMode wm,
 		       const TQString &host,
 		       Quality quality,
 		       const TQString &encodings,
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 5337e16a..9763b351 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -200,7 +200,7 @@ void KVncView::configureApp(Quality q, const TQString specialEncodings) {
 bool KVncView::checkLocalKRfb() {
 	if ( m_host != "localhost" && !m_host.isEmpty() )
 		return true;
-	DCOPClient *d = KApplication::dcopClient();
+	DCOPClient *d = TDEApplication::dcopClient();
 
 	int portNum;
 	TQByteArray sdata, rdata;
@@ -803,9 +803,9 @@ extern int isQuitFlagSet() {
 }
 
 extern void DrawScreenRegion(int x, int y, int width, int height) {
-/*	KApplication::kApplication()->lock();
+/*	TDEApplication::kApplication()->lock();
 	kvncview->drawRegion(x, y, width, height);
-	KApplication::kApplication()->unlock();
+	TDEApplication::kApplication()->unlock();
 */
 	TQApplication::postEvent(kvncview, new ScreenRepaintEvent(x, y, width, height));
 }
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 0a29b0ed..ff3760e9 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -104,7 +104,7 @@ void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
 	kinetdAvailable = false;
 	krfbAvailable = false;
 
-	DCOPClient *d = KApplication::dcopClient();
+	DCOPClient *d = TDEApplication::dcopClient();
 
 	TQByteArray sdata, rdata;
 	TQCString replyType;
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 289c4cec..d78f7f92 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -51,7 +51,7 @@ Configuration::Configuration(krfb_mode mode) :
 	portNum(-1),
 	kinetdRef("kded", "kinetd")
 {
-	kinetdRef.setDCOPClient(KApplication::dcopClient());
+	kinetdRef.setDCOPClient(TDEApplication::dcopClient());
 	loadFromKConfig();
 	saveToDialogs();
 	doKinetdConf();
@@ -438,7 +438,7 @@ void Configuration::inviteEmail() {
 	save();
 	emit invitationNumChanged(invitationList.size());
 
-	KApplication *app = KApplication::kApplication();
+	TDEApplication *app = TDEApplication::kApplication();
 	app->invokeMailer(TQString(), TQString(), TQString(),
 		i18n("Desktop Sharing (VNC) invitation"),
 		i18n("You have been invited to a VNC session. If you have the TDE Remote "
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index e764036c..a41f9808 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -31,12 +31,12 @@ TQString cryptStr(const TQString &aStr) {
 }
 
 // a random string that doesn't contain i, I, o, O, 1, 0
-// based on KApplication::randomString()
+// based on TDEApplication::randomString()
 static TQString readableRandomString(int length) {
    TQString str;
    while (length)
    {
-      int r = KApplication::random() % 62;
+      int r = TDEApplication::random() % 62;
       r += 48;
       if (r > 57) 
 	      r += 7;
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index 6d21ee36..db730dcf 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -55,7 +55,7 @@ static KCmdLineOptions options[] =
 
 void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
 	DCOPRef ref("kded", "kinetd");
-	ref.setDCOPClient(KApplication::dcopClient());
+	ref.setDCOPClient(TDEApplication::dcopClient());
 
 	DCOPReply r = ref.call("isInstalled", TQString("krfb"));
 	if (!r.isValid()) {
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
 	Configuration *config;
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index debe39f0..be384118 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -118,11 +118,11 @@ class AppLocker
 {
 public:
 	AppLocker() {
-		KApplication::kApplication()->lock();
+		TDEApplication::kApplication()->lock();
 	}
 
 	~AppLocker() {
-		KApplication::kApplication()->unlock();
+		TDEApplication::kApplication()->unlock();
 	}
 };
 
@@ -560,7 +560,7 @@ void RFBController::disableBackground(bool state) {
 
 	disableBackgroundState = state;
 	DCOPRef ref("kdesktop", "KBackgroundIface");
-	ref.setDCOPClient(KApplication::dcopClient());
+	ref.setDCOPClient(TDEApplication::dcopClient());
 
 	ref.send("setBackgroundEnabled(bool)", bool(!state));
 }
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index ab057cdd..2c633295 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -70,7 +70,7 @@ int main(int argc, char **argv){
     aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "[email protected]");
     TDECmdLineArgs::init( argc, argv, &aboutData );
 
-    KApplication a(argc, argv);
+    TDEApplication a(argc, argv);
 
     kConfig = a.config();
 
diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp
index ac2b76cb..cd2d1f57 100644
--- a/ksirc/dccMgrTest.cpp
+++ b/ksirc/dccMgrTest.cpp
@@ -32,7 +32,7 @@ private:
 
 
 int main(int argc, char **argv){
-    KApplication a(argc, argv, "dccMgrTest" );
+    TDEApplication a(argc, argv, "dccMgrTest" );
 
     dccManager kst(0, "toplevel");
     Timer t(&kst);
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 1817c4e8..ae6fb8c3 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -1962,7 +1962,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev )
 
     if (ev->button() & Qt::MidButton)
     {
-        emit pasteReq( KApplication::clipboard()->text( TQClipboard::Selection ) );
+        emit pasteReq( TDEApplication::clipboard()->text( TQClipboard::Selection ) );
         return;
     }
 }
diff --git a/ksirc/kstextviewtest.cpp b/ksirc/kstextviewtest.cpp
index ded2f45c..c3dadec6 100644
--- a/ksirc/kstextviewtest.cpp
+++ b/ksirc/kstextviewtest.cpp
@@ -27,7 +27,7 @@ private:
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kstextviewtest" );
+    TDEApplication app( argc, argv, "kstextviewtest" );
 
     KSirc::TextView view( 0 );
     app.setMainWidget( &view );
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 57f26fb5..34e63182 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -218,7 +218,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
   /*
    * Ok, let's look at the basic widget "layout"
    * Everything belongs to q TQFrame F, this is use so we
-   * can give the KApplication a single main client widget, which is needs.
+   * can give the TDEApplication a single main client widget, which is needs.
    *
    * A TQVbox and a TQHbox is used to ctronl the 3 sub widget
    * The Modified TQListBox is then added side by side with the User list box.
@@ -271,7 +271,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
 //  f = new kstInside(top, TQString(TQObject::name()) + "_" + "kstIFrame");
   top->setStretchFactor(pan, 1);
 
-  setCentralWidget(top);  // Tell the KApplication what the main widget is.
+  setCentralWidget(top);  // Tell the TDEApplication what the main widget is.
 
   logFile = 0;
   if ( ksopts->chan(m_channelInfo).logging && (m_channelInfo.channel() != "!no_channel" ))
@@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick)
 void KSircTopLevel::pasteToWindow()
 {
     // Ctrl-V
-  //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( TQClipboard::Clipboard ) << endl;
-  slotTextDropped(KApplication::clipboard()->text( TQClipboard::Clipboard ) );
+  //kdDebug(5008) << "Going to paste: " << TDEApplication::clipboard()->text( TQClipboard::Clipboard ) << endl;
+  slotTextDropped(TDEApplication::clipboard()->text( TQClipboard::Clipboard ) );
 }
 
 void KSircTopLevel::pasteToNickList(int button,
@@ -1510,7 +1510,7 @@ void KSircTopLevel::pasteToNickList(int button,
 	emit open_toplevel(ci);
 
 	TQStringList lines = TQStringList::split( '\n',
-						KApplication::clipboard()->text( TQClipboard::Selection ),
+						TDEApplication::clipboard()->text( TQClipboard::Selection ),
 						true );
 	TQStringList::ConstIterator it = lines.begin();
 	TQStringList::ConstIterator end = lines.end();
diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog
index 23d34b5a..775b08a1 100644
--- a/ktalkd/ChangeLog
+++ b/ktalkd/ChangeLog
@@ -365,7 +365,7 @@
 	It sets now $TDEBINDIR, for portable ktalkdrc files. TDEBINDIR 
 	is determined by a call to the kde_bindir() function.
 	Makefile doesn't define TALKD_CONF anymore for compilation :
-	ktalkd now opens ktalkdrc from KApplication::kde_configdir().
+	ktalkd now opens ktalkdrc from TDEApplication::kde_configdir().
 
 1998-03-26  David Faure  <[email protected]> (0.5.0)
 	ktalkdrc: Extprg is now $TDEDIR/bin/ktalkdlg.
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 03bd0670..a1e1338c 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -77,7 +77,7 @@ int main (int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, "ktalkdlg", description, version );
     TDECmdLineArgs::addCmdLineOptions( option );
     KLocale::setMainCatalogue( "kcmktalkd" );
-    KApplication a;
+    TDEApplication a;
 
     struct timeval clock;
     struct timezone zone;
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index e17cf5b0..d977c597 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -292,7 +292,7 @@ void LisaSettings::save()
          KProcess *proc = new KProcess();
          connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *)));
          *proc<<"tdesu"<<"-c"<<suCommand;
-         KApplication::setOverrideCursor(TQt::waitCursor);
+         TDEApplication::setOverrideCursor(TQt::waitCursor);
          setEnabled(false);
          if ( !proc->start() )
              delete proc;
@@ -376,7 +376,7 @@ void LisaSettings::autoSetup()
 void LisaSettings::saveDone(KProcess *proc)
 {
    unlink(TQFile::encodeName(m_tmpFilename));
-   KApplication::restoreOverrideCursor();
+   TDEApplication::restoreOverrideCursor();
    setEnabled(true);
    KMessageBox::information(0,i18n("The configuration has been saved to /etc/lisarc.\n"
                                    "Make sure that the LISa daemon is started,\n e.g. using an init script when booting.\n"
diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp
index 5ef95531..45daf23b 100644
--- a/librss/testlibrss.cpp
+++ b/librss/testlibrss.cpp
@@ -30,7 +30,7 @@ int main( int argc, char **argv )
 {
 	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app;
+	TDEApplication app;
 
 	Tester tester;
 	tester.test();
diff --git a/wifi/main.cpp b/wifi/main.cpp
index cb8fc020..1168d961 100644
--- a/wifi/main.cpp
+++ b/wifi/main.cpp
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs ();
   args->clear ();
 
-  KApplication app;
+  TDEApplication app;
 
   if (app.isRestored ())
     {