Use tdeApp

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

5 files changed, 38 insertions, 38 deletions

diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 9c89e1c4..238dd699 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -276,7 +276,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data)
     return;
   }
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
     TDEApplication::startServiceByDesktopName("kdict");
     waiting = 1;
@@ -306,7 +306,7 @@ void DictApplet::sendDelayedCommand()
     return;
   }
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
     waiting++;
     TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index f7d183cd..a72a375b 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -1178,24 +1178,24 @@ DictInterface::DictInterface()
   if (::pipe(fdPipeIn ) == -1 ) {
     perror( "Creating in pipe" );
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   if (::pipe(fdPipeOut ) == -1 ) {
     perror( "Creating out pipe" );
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   if (-1 == fcntl(fdPipeIn[0],F_SETFL,O_NONBLOCK)) {  // make socket non-blocking
     perror("fcntl()");
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   if (-1 == fcntl(fdPipeOut[0],F_SETFL,O_NONBLOCK)) {  // make socket non-blocking
     perror("fcntl()");
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   notifier = new TQSocketNotifier(fdPipeIn[0],TQSocketNotifier::Read,this);
@@ -1208,7 +1208,7 @@ DictInterface::DictInterface()
   client = new DictAsyncClient(fdPipeOut[0],fdPipeIn[1]);
   if (!client) {
     KMessageBox::error(global->topLevel, i18n("Internal error:\nUnable to create thread."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   client->start();
   
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 424ae13e..164c0477 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -113,7 +113,7 @@ void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
 MatchView::MatchView(TQWidget *parent, const char *name)
   : TQWidget(parent,name),getOn(false),getAllOn(false)
 {
-  setCaption(kapp->makeStdCaption(i18n("Match List")));
+  setCaption(tdeApp->makeStdCaption(i18n("Match List")));
 
   TQVBoxLayout * boxLayout = new TQVBoxLayout(this, 1, 0);
 
@@ -388,14 +388,14 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int)
     rightBtnMenu->insertSeparator();
   }
 
-  kapp->clipboard()->setSelectionMode(false);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(false);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(true);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(true);
+    text = tdeApp->clipboard()->text();
   }
   if (!text.isEmpty()) {
-    popupClip = kapp->clipboard()->text();
+    popupClip = tdeApp->clipboard()->text();
     rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQ_SLOT(popupMatchClip()));
     rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQ_SLOT(popupDefineClip()));
     rightBtnMenu->insertSeparator();
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index d1d93c1d..fb47eb8c 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -276,7 +276,7 @@ void QueryView::selectAll()
 
 void QueryView::copySelection()
 {
-  kapp->clipboard()->setText(part->selectedText());
+  tdeApp->clipboard()->setText(part->selectedText());
 }
 
 
@@ -380,9 +380,9 @@ void QueryView::slotURLRequest (const KURL &url, const KParts::URLArgs &)
     if(type=="dbinfo")
       interface->showDbInfo(urlText.utf8());
     if(type=="realhttp")
-      kapp->invokeBrowser("http://"+urlText);
+      tdeApp->invokeBrowser("http://"+urlText);
     if(type=="realftp")
-      kapp->invokeBrowser("ftp://"+urlText);
+      tdeApp->invokeBrowser("ftp://"+urlText);
   }
 }
 
@@ -441,11 +441,11 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
                              this,TQ_SLOT(popupMatchSelect()));
     rightBtnMenu->insertSeparator();
   } else {
-    kapp->clipboard()->setSelectionMode(false);
-    TQString text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    TQString text = tdeApp->clipboard()->text();
     if (text.isEmpty()) {
-      kapp->clipboard()->setSelectionMode(true);
-      text = kapp->clipboard()->text();
+      tdeApp->clipboard()->setSelectionMode(true);
+      text = tdeApp->clipboard()->text();
     }
     if (!text.isEmpty()) {
       popupSelect = TQApplication::clipboard()->text();
@@ -506,7 +506,7 @@ void QueryView::popupMatchLink()
 
 void QueryView::popupOpenLink()
 {
-  kapp->invokeBrowser(popupLink);
+  tdeApp->invokeBrowser(popupLink);
 }
 
 
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index eb1af9c9..7b6795b9 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -54,8 +54,8 @@ TopLevel::TopLevel(TQWidget* parent, const char* name)
   : DCOPObject("KDictIface"), TDEMainWindow(parent, name, WType_TopLevel),
     optDlg(0L), setsDlg(0L), stopRef(0)
 {
-  kapp->dcopClient()->setDefaultObject(objId());
-  kapp->setMainWidget(this);
+  tdeApp->dcopClient()->setDefaultObject(objId());
+  tdeApp->setMainWidget(this);
 
   global = new GlobalData();
   global->topLevel = this;
@@ -134,7 +134,7 @@ void TopLevel::normalStartup()
 void TopLevel::quit()
 {
   kdDebug(5004) << "*DCOP call* TopLevel::quit()" << endl;
-  kapp->closeAllWindows();
+  tdeApp->closeAllWindows();
 }
 
 
@@ -266,11 +266,11 @@ void TopLevel::define(const TQString &query)
 void TopLevel::defineClipboard()
 {
   kdDebug(5004) << "TopLevel::defineClipboard()" << endl;
-  kapp->clipboard()->setSelectionMode(true);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(true);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(false);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    text = tdeApp->clipboard()->text();
   }
   define(text);
 }
@@ -287,11 +287,11 @@ void TopLevel::match(const TQString &query)
 void TopLevel::matchClipboard()
 {
   kdDebug(5004) << "TopLevel::matchClipboard()" << endl;
-  kapp->clipboard()->setSelectionMode(true);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(true);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(false);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    text = tdeApp->clipboard()->text();
   }
   match(text);
 }
@@ -324,7 +324,7 @@ void TopLevel::setupActions()
   actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this,
                  TQ_SLOT(stopClients()), actionCollection(), "stop_query");
   actStopQuery->setEnabled(false);
-  KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
+  KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection());
 
   // edit menu...
   actCopy = KStdAction::copy(queryView, TQ_SLOT(copySelection()), actionCollection());
@@ -588,7 +588,7 @@ void TopLevel::clientStarted(const TQString &message)
   resetStatusbarTimer.stop();
   stopRef++;
   actStopQuery->setEnabled(stopRef>0);       // enable stop-icon
-  kapp->setOverrideCursor(waitCursor);
+  tdeApp->setOverrideCursor(waitCursor);
 }
 
 
@@ -599,7 +599,7 @@ void TopLevel::clientStopped(const TQString &message)
   if (stopRef > 0)
     stopRef--;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 }
 
 
@@ -614,7 +614,7 @@ void TopLevel::renderingStarted()
 {
   stopRef++;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->setOverrideCursor(waitCursor);
+  tdeApp->setOverrideCursor(waitCursor);
 }
 
 
@@ -623,7 +623,7 @@ void TopLevel::renderingStopped()
   if (stopRef > 0)
     stopRef--;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 }
 
 
@@ -767,7 +767,7 @@ void TopLevel::optionsChanged()
 void TopLevel::raiseWindow()
 {
   // Bypass focus stealing prevention
-  kapp->updateUserTimestamp();
+  tdeApp->updateUserTimestamp();
 
   KWin::WindowInfo info = KWin::windowInfo( winId() );