Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 20 insertions, 20 deletions

diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 78936267..a9cdb783 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -57,7 +57,7 @@ int main( int argc, char *argv[] )
   TDELocale::setMainCatalogue("kommander");
   TDEApplication a(true, true);
   
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("General");
   bool splashScreen = config->readBoolEntry("SplashScreen", true);
   KSplashScreen* splash = 0;
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 9f926a95..1d0c3cfb 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -136,7 +136,7 @@ MainWindow::MainWindow(bool asClient)
 
   setupPlugins();
 
-  kapp->setMainWidget(this);
+  tdeApp->setMainWidget(this);
   self = this;
 
   prefDia = 0;
@@ -171,13 +171,13 @@ MainWindow::MainWindow(bool asClient)
   emit hasActiveWindow(false);
 
   lastPressWidget = 0;
-  kapp->installEventFilter(this);
+  tdeApp->installEventFilter(this);
 
-  TQSize as(kapp->desktop()->size());
+  TQSize as(tdeApp->desktop()->size());
   as -= TQSize(30, 30);
   resize(TQSize(1200, 1000).boundedTo(as));
 
-  connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged()));
+  connect(tdeApp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged()));
   clipboardChanged();
   layoutChilds = false;
   layoutSelected = false;
@@ -926,7 +926,7 @@ void MainWindow::popupFormWindowMenu(const TQPoint & gp, FormWindow *fw)
     setupRMBSpecialCommands(ids, commands, fw);
     setupRMBProperties(ids, commands, fw);
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     int r = rmbFormWindow->exec(gp);
 
     handleRMBProperties(r, commands, fw);
@@ -944,7 +944,7 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
     setupRMBSpecialCommands(ids, commands, w);
     setupRMBProperties(ids, commands, w);
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     int r = rmbWidgets->exec(gp);
 
     handleRMBProperties(r, commands, w);
@@ -1257,7 +1257,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
 
 void MainWindow::clipboardChanged()
 {
-    TQString text(kapp->clipboard()->text());
+    TQString text(tdeApp->clipboard()->text());
     TQString start("<!DOCTYPE UI-SELECTION>");
     actionEditPaste->setEnabled(text.left(start.length()) == start);
 }
@@ -1392,7 +1392,7 @@ void MainWindow::selectionChanged()
 
 void MainWindow::writeConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
 
   config->setGroup("General");
   config->writeEntry("RestoreWorkspace", restoreConfig);
@@ -1429,7 +1429,7 @@ void MainWindow::writeConfig()
 
 void MainWindow::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
 
   config->setGroup("General");
   restoreConfig = config->readBoolEntry("RestoreWorkspace", true);
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index d0ccda3f..68e197ec 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -457,7 +457,7 @@ void MainWindow::setupFileActions()
 
   fileMenu->insertSeparator();
 
-  a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
+  a = KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection());
   a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Exit"));
   a->plug(fileMenu);
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 31af80f0..28c33c33 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -108,12 +108,12 @@ void MessageLog::clearContent()
 void MessageLog::copyLine()
 {
   if (m_lists[currentPageIndex()]->count())
-    kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
+    tdeApp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
 }
 
 void MessageLog::copyContent()
 {
-  kapp->clipboard()->setText(content(), TQClipboard::Clipboard);
+  tdeApp->clipboard()->setText(content(), TQClipboard::Clipboard);
 }
 
 void MessageLog::saveToFile()
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index b746ec97..013949e4 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -162,9 +162,9 @@ bool Instance::run()
     dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec();
   else if (m_instance->inherits("TQMainWindow"))
   {
-    kapp->setMainWidget(m_instance);
+    tdeApp->setMainWidget(m_instance);
     dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show();
-    kapp->exec();
+    tdeApp->exec();
   }
   else return false;
   return true;
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 47db3bd0..ddfe8a86 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -283,7 +283,7 @@ static ParseNode f_executeSlot(Parser* parser, const ParameterList& params)
 /******************* DCOP function ********************************/
 static ParseNode f_dcopid(Parser*, const ParameterList& )
 {
-  return TQString(kapp->dcopClient()->appId());
+  return TQString(tdeApp->dcopClient()->appId());
 }
 
 static ParseNode f_pid(Parser*, const ParameterList& )
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 59aaec07..7d56f0af 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -41,7 +41,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
     case Kommander::selectedWidgetText:
       return handleDCOP(DCOP::selection);
     case Kommander::dcopid:
-      return kapp->dcopClient()->appId();
+      return tdeApp->dcopClient()->appId();
     case Kommander::pid:
       return TQString().setNum(getpid());
     case Kommander::null:
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 9c215f7d..bcea2b11 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -347,7 +347,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
 TQString KommanderWidget::localDCOPQuery(const TQString function, const TQStringList& args)
 {
   TQStringList pArgs;
-  pArgs.append(kapp->dcopClient()->appId());
+  pArgs.append(tdeApp->dcopClient()->appId());
   pArgs.append("KommanderIf");
   pArgs.append(function);
   for (uint i=0; i<args.count(); i++)
@@ -359,7 +359,7 @@ TQString KommanderWidget::localDCOPQuery(const TQString function, const TQString
      const TQString& arg2, const TQString& arg3, const TQString& arg4)
 {
   TQStringList pArgs;
-  pArgs.append(kapp->dcopClient()->appId());
+  pArgs.append(tdeApp->dcopClient()->appId());
   pArgs.append("KommanderIf");
   pArgs.append(function);
   pArgs.append(arg1);
@@ -419,7 +419,7 @@ void KommanderWidget::printError(const TQString& a_error) const
           exit(-1);
         }
         else if (parentDialog()->inherits("TQMainWindow"))
-          kapp->quit();
+          tdeApp->quit();
     }
   }
   else