Rename KApplication to TDEApplication to avoid conflicts with KDE4

9 files changed, 11 insertions, 11 deletions

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();