Rename KApplication to TDEApplication to avoid conflicts with KDE4

26 files changed, 38 insertions, 38 deletions

diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index f6be262..cbf8218 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -2287,7 +2287,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9"  "rou", 0, "[email protected]");
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 
-	KApplication app;
+	TDEApplication app;
 #if 0
 	app->enableSessionManagement(true);
 	app->setWmCommand(argv[0]);
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 5519266..85f09e4 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
   aboutData.addCredit("Benjamin C. Meyer",I18N_NOOP("XMLUI conversion"),"[email protected]");
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   KConfig *config = kapp->config();
 
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index 0f34b4f..ddc2205 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -120,7 +120,7 @@ void IRKick::doQuit()
 		case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break;
 		case KMessageBox::Cancel: return;
 	}
-	KApplication::kApplication()->quit();
+	TDEApplication::kApplication()->quit();
 }
 
 void IRKick::resetModes()
@@ -152,7 +152,7 @@ void IRKick::slotReloadConfiguration()
 
 void IRKick::slotConfigure()
 {
-	KApplication::startServiceByDesktopName("kcmlirc");
+	TDEApplication::startServiceByDesktopName("kcmlirc");
 }
 
 void IRKick::updateModeIcons()
@@ -180,7 +180,7 @@ void IRKick::updateModeIcons()
 
 bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
 {
-	DCOPClient *theDC = KApplication::dcopClient();
+	DCOPClient *theDC = TDEApplication::dcopClient();
 	programs.clear();
 
 	if(action.unique())
@@ -234,7 +234,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
 
 void IRKick::executeAction(const IRAction &action)
 {
-	DCOPClient *theDC = KApplication::dcopClient();
+	DCOPClient *theDC = TDEApplication::dcopClient();
 	TQStringList programs;
 
 	if(!getPrograms(action, programs)) return;
@@ -245,7 +245,7 @@ void IRKick::executeAction(const IRAction &action)
 		if(!sname.isNull())
 		{
 			KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").arg(action.application()), SmallIcon("irkick"), theTrayIcon);
-			KApplication::startServiceByDesktopName(sname);
+			TDEApplication::startServiceByDesktopName(sname);
 		}
 	}
 	if(action.isJustStart()) return;
@@ -286,7 +286,7 @@ void IRKick::gotMessage(const TQString &theRemote, const TQString &theButton, in
 		// send notifier by DCOP to npApp/npModule/npMethod(theRemote, theButton);
 		TQByteArray data; TQDataStream arg(data, IO_WriteOnly);
 		arg << theRemote << theButton;
-		KApplication::dcopClient()->send(theApp.utf8(), npModule.utf8(), npMethod.utf8(), data);
+		TDEApplication::dcopClient()->send(theApp.utf8(), npModule.utf8(), npMethod.utf8(), data);
 	}
 	else
 	{
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index c12b9f0..d5df7ec 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -143,7 +143,7 @@ void AddAction::updateButtonStates()
 const TQStringList AddAction::getFunctions(const TQString app, const TQString obj)
 {
 	TQStringList ret;
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->remoteFunctions(app.utf8(), obj.utf8());
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 		if(	*i != "QCStringList interfaces()" &&
@@ -335,7 +335,7 @@ void AddAction::updateObjects()
 	uniqueProgramMap.clear();
 	nameProgramMap.clear();
 
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 8b1b03b..be113e6 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications()
 	TQStringList names;
 
 	theDCOPApplications->clear();
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
@@ -337,7 +337,7 @@ void EditAction::updateDCOPApplications()
 void EditAction::updateDCOPObjects()
 {
 	theDCOPObjects->clear();
-	DCOPClient *theClient = KApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
 	if(theDCOPApplications->currentText().isNull() || theDCOPApplications->currentText().isEmpty()) return;
 	QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8());
 	if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object());
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index c59632a..ccd9d2f 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -56,10 +56,10 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 	setButtons(KCModule::Help);
 	setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
 	bool ok;
-	KApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	if(!ok)
 		if(KMessageBox::questionYesNo(this, i18n("The Infrared Remote Control software is not currently running. This configuration module will not work properly without it. Would you like to start it now?"), i18n("Software Not Running"), i18n("Start"), i18n("Do Not Start")) == KMessageBox::Yes)
-		{	kdDebug() << "S" << KApplication::startServiceByDesktopName("irkick") << endl;
+		{	kdDebug() << "S" << TDEApplication::startServiceByDesktopName("irkick") << endl;
 			KSimpleConfig theConfig("irkickrc");
 			theConfig.setGroup("General");
 			if(theConfig.readBoolEntry("AutoStart", true) == false)
@@ -67,7 +67,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 					theConfig.writeEntry("AutoStart", true);
 		}
 
-	KApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	kdDebug() << "OK" << ok << endl;
 
 
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index 249bd1a..159fa64 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // Stop daemon and exit?
diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp
index ae10aee..1e913ff 100644
--- a/kdf/kconftest.cpp
+++ b/kdf/kconftest.cpp
@@ -49,7 +49,7 @@ main(int argc, char ** argv)
 {
  TDECmdLineArgs::init(argc, argv, "test", description, version);
  
- KApplication app;
+ TDEApplication app;
  KConfig * cfg = kapp->config();
 
  TQDict<char> dict;
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index ccaffcb..f41242b 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
   aboutData.addAuthor("Michael Kropfberger",0, "[email protected]");
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   if( app.isRestored() ) //SessionManagement
   {
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index f1ca13a..09f3969 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -331,7 +331,7 @@ int main(int argc, char **argv)
                     "[email protected]" );
    TDECmdLineArgs::init(argc, argv, &about);
    TDECmdLineArgs::addCmdLineOptions( options );
-   KApplication app;
+   TDEApplication app;
    KwikDisk *mainWin = 0;
 
    mainWin = new KwikDisk;
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index b88c014..8e77b89 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -1270,7 +1270,7 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
 	TDECmdLineArgs::init( argc, argv, &aboutData );
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	KApplication a;
+	TDEApplication a;
 	//CT KIO::Job::initStatic();
 	if ( a.isRestored() )
 	{
diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp
index 749cb65..d7f9935 100644
--- a/kfloppy/main.cpp
+++ b/kfloppy/main.cpp
@@ -66,7 +66,7 @@ int main( int argc, char *argv[] )
   }
   args->clear();
 
-  KApplication a;
+  TDEApplication a;
 
   FloppyData* floppy  = new FloppyData();
   a.setMainWidget(floppy);
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index 85bce3a..f7715a4 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
                 return 0;
 
         //KgpgAppletApp *app;
-        KApplication *app;
+        TDEApplication *app;
         app=new KgpgAppletApp;
         return app->exec();
 
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 18ea05b..22f939d 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e )
     if( mPending == true )
     {
       mPending = false;
-      emit startDrag( ( kapp->keyboardModifiers() & KApplication::ShiftModifier ) );
+      emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
     }
   }
 }
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index bccf654..85fd284 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -312,7 +312,7 @@ class CHexViewWidget : public TQFrame
 
 inline bool CHexViewWidget::shiftButtonState( void )
 {
-  return kapp->keyboardModifiers() & KApplication::ShiftModifier;
+  return kapp->keyboardModifiers() & TDEApplication::ShiftModifier;
 }
 
 
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 8c8e8ab..89d8203 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -70,7 +70,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( option );
 
-  KApplication app;
+  TDEApplication app;
 
   if( app.isRestored() != 0 )
   {
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 5877a65..5839720 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -44,7 +44,7 @@ main(int argc, char **argv)
     aboutData.addAuthor("Paul Campbell",0, "[email protected]");
     TDECmdLineArgs::init( argc, argv, &aboutData );
 
-    KApplication a;
+    TDEApplication a;
     daemon_state s;
     s.load();
     if (s.need_to_run()) 
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 5b710c5..3d1caab 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -820,14 +820,14 @@ void laptop_daemon::invokeHibernate()
 
 void laptop_daemon::invokeLogout()
 {
-	bool rc = kapp->requestShutDown(KApplication::ShutdownConfirmNo, KApplication::ShutdownTypeNone, KApplication::ShutdownModeForceNow);
+	bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow);
 	if (!rc)
 		KMessageBox::sorry(0, i18n("Logout failed."));
 }
 
 void laptop_daemon::invokeShutdown()
 {
-	bool rc = kapp->requestShutDown(KApplication::ShutdownConfirmNo, KApplication::ShutdownTypeHalt, KApplication::ShutdownModeForceNow);
+	bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow);
 	if (!rc)
 		KMessageBox::sorry(0, i18n("Shutdown failed."));
 }
diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp
index 7cd1844..fe1a317 100644
--- a/kregexpeditor/main.cpp
+++ b/kregexpeditor/main.cpp
@@ -40,7 +40,7 @@ int main( int argc, char* argv[] )
 			  KAboutData::License_GPL,
                           "(c) 2002-2003 Jesper K. Pedersen");
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication myapp;
+    TDEApplication myapp;
 #endif
 
     TQDialog* top = new TQDialog( 0 );
diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp
index 31903dd..a0c0c00 100644
--- a/kregexpeditor/test-without-dl/main.cpp
+++ b/kregexpeditor/test-without-dl/main.cpp
@@ -45,7 +45,7 @@ public:
 int main( int argc, char* argv[] )
 {
   TDECmdLineArgs::init(argc, argv, "RegExp Example","","");
-  KApplication myapp( argc, argv );
+  TDEApplication myapp( argc, argv );
 
   tqApp->installEventFilter( new ShootABug() );
 
diff --git a/ktimer/main.cpp b/ktimer/main.cpp
index b35d8eb..e648d5f 100644
--- a/ktimer/main.cpp
+++ b/ktimer/main.cpp
@@ -36,7 +36,7 @@ int main( int argc, char **argv )
     aboutData.addAuthor("Stefan Schimanski",0, "[email protected]");
     TDECmdLineArgs::init( argc, argv, &aboutData );
 
-    KApplication app;
+    TDEApplication app;
 
     KTimerPref *timer = new KTimerPref;
     app.setMainWidget( timer );
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index 67c1c90..44e2844 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -164,7 +164,7 @@ void KWalletConfig::newNetworkWallet() {
 
 void KWalletConfig::launchManager() {
 	if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
-		KApplication::startServiceByDesktopName("kwalletmanager_show");
+		TDEApplication::startServiceByDesktopName("kwalletmanager_show");
 	} else {
 		DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
 		r.send("show");
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index 38c525b..d73cba2 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -52,7 +52,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	_kwalletdLaunch = false;
 	TQAccel *accel = new TQAccel(this, "kwalletmanager");
 
-	KApplication::dcopClient()->setQtBridgeEnabled(false);
+	TDEApplication::dcopClient()->setQtBridgeEnabled(false);
 	_shuttingDown = false;
 	KConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
 	KConfigGroup walletConfigGroup(&cfg, "Wallet");
@@ -399,7 +399,7 @@ void KWalletManager::shuttingDown() {
 
 
 void KWalletManager::setupWallet() {
-	KApplication::startServiceByDesktopName("kwallet_config");
+	TDEApplication::startServiceByDesktopName("kwallet_config");
 }
 
 
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index ac0089e..f8b2c1b 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -235,7 +235,7 @@ void KarambaApplication::buildToolTip()
   setToolTip(toolTip);
 }
 
-void KarambaApplication::checkPreviousSession(KApplication &app,
+void KarambaApplication::checkPreviousSession(TDEApplication &app,
                                               TQStringList &lst)
 {
   /******
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index f33fce8..30f40e6 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -36,7 +36,7 @@ class dcopIface_stub;
 class KHelpMenu;
 class KAboutData;
 
-class KarambaApplication : public KApplication
+class KarambaApplication : public TDEApplication
 {
     Q_OBJECT
   
@@ -66,7 +66,7 @@ class KarambaApplication : public KApplication
     bool themeExists(TQString pretty_name);
     void initDcopStub(TQCString app = "");
     void setUpSysTray(KAboutData* about);
-    void checkPreviousSession(KApplication &app, TQStringList &lst);
+    void checkPreviousSession(TDEApplication &app, TQStringList &lst);
     void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
     bool startThemes(TQStringList &lst);
     KarambaIface* dcopIface() { return iface; };
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 8f5dfc5..45f0be2 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 //     karamba *mainWin = 0;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();