Rename KApplication to TDEApplication to avoid conflicts with KDE4

26 files changed, 34 insertions, 34 deletions

diff --git a/kfilereplace/main.cpp b/kfilereplace/main.cpp
index 1f7bdef0..2f4ff1a3 100644
--- a/kfilereplace/main.cpp
+++ b/kfilereplace/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index a21591e5..4ca05bc4 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -821,7 +821,7 @@ void KImageMapEditor::slotUpdateSelectionCoords( const TQRect & r )
   kapp->processEvents();
 }
 
-KApplication* KImageMapEditor::app() const
+TDEApplication* KImageMapEditor::app() const
 {
   return kapp;
 }
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index bfe6dd98..d5462645 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -116,7 +116,7 @@ class KAction;
 #endif
 ///class TQListViewItem;
 class KCommandHistory;
-class KApplication;
+class TDEApplication;
 class TQTabWidget;
 class AreaListView;
 class ImagesListView;
@@ -174,7 +174,7 @@ public :
     int showTagEditor(Area *);
     KCommandHistory *commandHistory() const;
 
-    KApplication* app() const;
+    TDEApplication* app() const;
 
     // Only refreshes the listView
     void updateSelection() const;
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index 679ef7b2..c27be373 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication a;
+  TDEApplication a;
   a.dcopClient()->registerAs(a.name());
 
 
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index 8c5da395..ec6c9c37 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -112,7 +112,7 @@ void KLinkStatus::setupActions()
     register it with staticKLSConfigDeleter due to the lack of static deleter 
     administration.
     The easiest solution is to call close() on the mainwindow instead of 
-    KApplication::quit()*/
+    TDEApplication::quit()*/
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
     //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index e4535188..b46d02ea 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 2303e8bb..43a80aa6 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -218,7 +218,7 @@ void SessionWidget::slotCheck()
     if(!validFields())
     {
         ready_ = true;
-        KApplication::beep();
+        TDEApplication::beep();
         return;
     }
 
@@ -430,7 +430,7 @@ void SessionWidget::slotSearchFinished()
     Q_ASSERT(!paused_);
     Q_ASSERT(!stopped_);
     
-    KApplication::beep ();
+    TDEApplication::beep ();
 
     textlabel_progressbar->setText(i18n( "Ready" ));
     progressbar_checker->reset();
@@ -458,7 +458,7 @@ void SessionWidget::slotSearchPaused()
     Q_ASSERT(pendingActions());
     Q_ASSERT(in_progress_);
     
-    KApplication::beep();
+    TDEApplication::beep();
 
     textlabel_progressbar->setText(i18n("Stopped"));
 
@@ -591,7 +591,7 @@ void SessionWidget::slotStartSearch()
     {
         start_search_action_->setChecked(true); // do not toggle
         Q_ASSERT(!stopped_);
-        KApplication::beep();
+        TDEApplication::beep();
         return;
     }
     
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index fd3884a5..2ca1a253 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
     {
         if ( styleSheet )
         {
-            static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
+            static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( TDEApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
 
             static const char* params[3] = {
                 "appdata",
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 013e3b65..672abd25 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -55,7 +55,7 @@ int main( int argc, char *argv[] )
   KommanderWidget::inEditor = true;
 
   KLocale::setMainCatalogue("kommander");
-  KApplication a(true, true);
+  TDEApplication a(true, true);
   
   KConfig *config = kapp->config();
   config->setGroup("General");
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index a389ac57..89c4c5c0 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
   }
   else
     KLocale::setMainCatalogue("kommander");
-  KApplication app;
+  TDEApplication app;
 
   TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
   if (!args->count())
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index d58c1af1..6030a833 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-  KApplication app;
+  TDEApplication app;
   
   if (!args->getOption("add").isNull() || !args->getOption("remove").isNull() || args->isSet("check")  || args->isSet("list"))
   {
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 293d4ed9..0b64b8ba 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -363,7 +363,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
   }
   function.append(TQString("(%1)").arg(items.join(",")));
   TQCString replyType, byteReply;
-  DCOPClient* cl = KApplication::dcopClient();
+  DCOPClient* cl = TDEApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(),
        byteData, replyType, byteReply))
   {
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 182f7faf..12542861 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -304,7 +304,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
       byteDataStream << a_query[i+3];
   }
 
-  DCOPClient *cl = KApplication::dcopClient();
+  DCOPClient *cl = TDEApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(), byteData, replyType, byteReply))
   {
     printError(i18n("Tried to perform DCOP query, but failed."));
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 63bb503b..4e88eb22 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -117,14 +117,14 @@ void ExecButton::startProcess()
   if (m_blockGUI != None)
     setEnabled(false);
   if (m_blockGUI == GUI)
-    KApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
+    TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
   MyProcess* process = new MyProcess(this);
   process->setBlocking(m_blockGUI == GUI);
   connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*)));
   m_output = process->run(at);
   if (m_blockGUI == GUI)
   {
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
     if (writeStdout())
       cout << m_output << flush;
   }
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 3ac3558e..34f936c6 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
     about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index efa924ba..cab2c838 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -99,11 +99,11 @@ static const KCmdLineOptions options[] =
     KCmdLineLastOption // End of options.
 };
 
-class XsldbgApp : public KApplication
+class XsldbgApp : public TDEApplication
 {
  public:
     XsldbgApp()
-	:KApplication(false, false)
+	:TDEApplication(false, false)
     {
 	xsldbgSetAppFunc(notifyXsldbgAppSimple);
 	xsldbgSetAppStateFunc(notifyStateXsldbgAppSimple);
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 6a37aa61..c572f347 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -72,7 +72,7 @@ void KNewStuff::download()
 TQString KNewStuff::downloadDestination( Entry * )
 {
   return KGlobal::dirs()->saveLocation( "tmp" ) +
-         KApplication::randomString( 10 );
+         TDEApplication::randomString( 10 );
 }
 
 void KNewStuff::upload()
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index f80be179..58f7d667 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -537,7 +537,7 @@ void CVSService::startService()
   if (!m_cvsService) 
   {
     TQString error;
-    KApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
+    TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
                                             &m_appId);
     m_cvsService = new CvsService_stub(m_appId, "CvsService");
   }
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index d8e44d45..29cabe4e 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -788,7 +788,7 @@ void ActionConfigDialog::slotNewAction()
 {
   TQDomDocument doc;
   TQDomElement el = doc.createElement("action");
-  el.setAttribute( "name", "user_"+KApplication::randomString(10) );
+  el.setAttribute( "name", "user_"+TDEApplication::randomString(10) );
   el.setAttribute( "icon", "ball" );
 
   currentAction = new TagAction(&el, m_mainWindow);
diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index f8002c6a..032b70a8 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -1525,7 +1525,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="1270" value="" type="QPopupMenu *" abstract="0" documentation="" name="fileMenu" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1271" value="" type="QPopupMenu *" abstract="0" documentation="" name="folderMenu" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="1298" abstract="0" documentation="" name="KApplication" static="0" scope="200" />
+   <UML:Class stereotype="" package="" xmi.id="1298" abstract="0" documentation="" name="TDEApplication" static="0" scope="200" />
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="274" roleb="307" multia="" multib="" package="" xmi.id="1311" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="74" roleb="307" multia="" multib="" package="" xmi.id="1312" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="695" roleb="307" multia="" multib="" package="" xmi.id="1313" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
@@ -2661,7 +2661,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="1265" label="slotReload" />
       <listitem open="0" type="815" id="1266" label="~FilesTreeView" />
      </listitem>
-     <listitem open="1" type="813" id="1298" label="KApplication" />
+     <listitem open="1" type="813" id="1298" label="TDEApplication" />
      <listitem open="1" type="813" id="1570" label="KListView" />
      <listitem open="0" type="813" id="564" label="KQApplication" >
       <listitem open="0" type="815" id="565" label="KQApplication" />
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index a470dd13..39053e86 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -60,7 +60,7 @@ KSplash::~KSplash()
 
 
 KQApplication::KQApplication()
- : KApplication()
+ : TDEApplication()
 {
    args = TDECmdLineArgs::parsedArgs();
    splash = 0L;
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index ab154345..c99c152b 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -49,7 +49,7 @@ class KQApplicationPrivate
     KSplashScreen *sp;
 };
 
-class KQApplication : public KApplication, KQApplicationPrivate
+class KQApplication : public TDEApplication, KQApplicationPrivate
 {
   Q_OBJECT
   
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 3b725f9d..52d4b07c 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -192,8 +192,8 @@ int main(int argc, char *argv[])
     }
   }
 
-  KApplication *app;
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication *app;
+  TDEApplication::disableAutoDcopRegistration();
 
   if (isUnique) {
       KUniqueApplication::dcopClient()->registerAs("quanta-foo");
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 5525a570..81c04aff 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1150,7 +1150,7 @@ void QuantaApp::slotOptionsConfigureActions()
 void QuantaApp::slotPreviewOptions()
 {
   KMessageBox::information(this, i18n("Changes made in the preview configuration dialog are global and have effect on every application using the KHTML part to display web pages, including Konqueror."), i18n("Warning"), "configure_preview_warning");
-  KApplication::startServiceByDesktopName("quanta_preview_config");
+  TDEApplication::startServiceByDesktopName("quanta_preview_config");
 }
 
 void QuantaApp::slotOptions()
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index e59ba248..42765a21 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -1484,7 +1484,7 @@ void QuantaInit::checkRuntimeDependencies()
   TQString error;
   TQCString appId;
 
-  KApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
+  TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
                                             &appId);
   if (appId.isEmpty())
   {
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 5cfe5dc9..3c05ef0e 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -505,7 +505,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ
            setOpen(item, !isOpen(item));
       setSelected(item, true);
       
-      bool const ctrlPressed = KApplication::keyboardMouseState() & TQt::ControlButton;
+      bool const ctrlPressed = TDEApplication::keyboardMouseState() & TQt::ControlButton;
       
       if(ctrlPressed)
           setContiguousSelectedItems();