Use tdeAppHEADmaster

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

4 files changed, 22 insertions, 22 deletions

diff --git a/kbiff/kbiff.cpp b/kbiff/kbiff.cpp
index 869f177..d4ad02b 100644
--- a/kbiff/kbiff.cpp
+++ b/kbiff/kbiff.cpp
@@ -45,7 +45,7 @@ KBiff::KBiff(DCOPClient *client_, TQWidget *parent_)
     setAlignment(AlignLeft | AlignTop);
 
     // enable the session management stuff
-    connect(kapp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(saveYourself()));
+    connect(tdeApp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(saveYourself()));
 
     // nuke the list stuff when removed
     monitorList.setAutoDelete(true);
@@ -66,7 +66,7 @@ KBiff::~KBiff()
     delete mled;
 
     // we no longer want to be registered
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQCString proxy = TQCString("kbiff-") + TQCString().setNum(getpid());
     if (client->isApplicationRegistered(proxy) == true)
     {
@@ -125,7 +125,7 @@ void KBiff::processSetup(const KBiffSetup* setup_, bool run_)
     if (sessions == false)
     {
       disconnect(this, TQ_SLOT(saveYourself()));
-      kapp->disableSessionManagement();
+      tdeApp->disableSessionManagement();
     }
 
     // if we are going to be doing status, we might as well create
@@ -198,7 +198,7 @@ bool KBiff::isDocked() const
 
 void KBiff::readSessionConfig()
 {
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
 
     config->setGroup("KBiff");
 
@@ -354,7 +354,7 @@ void KBiff::saveYourself()
 {
     if (sessions)
     {
-        TDEConfig *config = kapp->sessionConfig();
+        TDEConfig *config = tdeApp->sessionConfig();
         config->setGroup("KBiff");
 
         config->writeEntry("Profile", profile);
@@ -368,7 +368,7 @@ void KBiff::saveYourself()
 
 void KBiff::invokeHelp()
 {
-    kapp->invokeHelp();
+    tdeApp->invokeHelp();
 }
 
 void KBiff::displayPixmap()
@@ -515,7 +515,7 @@ void KBiff::haveNewMail(const int num, const TQString& the_mailbox)
     // beep if we are allowed to
     if (systemBeep)
     {
-        kapp->beep();
+        tdeApp->beep();
     }
 
     // run a command if we have to
@@ -621,14 +621,14 @@ void KBiff::dock()
         this->hide();
         this->destroy(true, true);
         this->create(0, true, false);
-        kapp->setMainWidget(this);
+        tdeApp->setMainWidget(this);
 
         // we don't want a "real" top widget if we are _going_ to
         // be docked.
         if (docked)
-            kapp->setTopWidget(this);
+            tdeApp->setTopWidget(this);
         else
-            kapp->setTopWidget(new TQWidget);
+            tdeApp->setTopWidget(new TQWidget);
     }
 
     if (docked == false)
@@ -721,7 +721,7 @@ void KBiff::start()
 void KBiff::popupMenu()
 {
     TDEPopupMenu *popup = new TDEPopupMenu(0, "popup");
-    popup->insertTitle(kapp->miniIcon(), profile);
+    popup->insertTitle(tdeApp->miniIcon(), profile);
 
     // if secure, disable everything but exit
     if (isSecure == false)
@@ -755,7 +755,7 @@ void KBiff::popupMenu()
         popup->insertSeparator();
     }
 
-    popup->insertItem(i18n("E&xit"), kapp, TQ_SLOT(quit()));
+    popup->insertItem(i18n("E&xit"), tdeApp, TQ_SLOT(quit()));
 
     popup->popup(TQCursor::pos());
 }
@@ -897,7 +897,7 @@ int KBiff::newMailCount(const TQString& url)
             TQCString reply_type;
             TQDataStream reply(reply_data, IO_ReadOnly);
 
-            DCOPClient *dcc = kapp->dcopClient();
+            DCOPClient *dcc = tdeApp->dcopClient();
             if (dcc->call(proxy.ascii(), "kbiff",
                           "newMailCount(TQString)", data, reply_type,
                           reply_data) == true)
@@ -945,7 +945,7 @@ bool KBiff::findMailbox(const TQString& url, TQString& proxy)
         TQStringList::Iterator it = proxyList.begin();
         for ( ; it != proxyList.end(); it++)
         {
-            DCOPClient *dcc = kapp->dcopClient();
+            DCOPClient *dcc = tdeApp->dcopClient();
             if (dcc->call(TQCString((*it).ascii()), "kbiff",
                         "hasMailbox(TQString)", data, replyType,
                         replyData) == true)
diff --git a/kbiff/main.cpp b/kbiff/main.cpp
index 925a55c..d205db3 100644
--- a/kbiff/main.cpp
+++ b/kbiff/main.cpp
@@ -49,7 +49,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
   args->clear();
 
   // restore this app if it is
-  if (kapp->isRestored())
+  if (tdeApp->isRestored())
     kbiff.readSessionConfig();
   else
   {
@@ -75,11 +75,11 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
   // check if we are docked (only if restored)
   if (kbiff.isDocked())
   {
-    kapp->setTopWidget(new TQWidget);
+    tdeApp->setTopWidget(new TQWidget);
     KWin::setSystemTrayWindowFor(kbiff.winId(), 0);
   }
   else
-    kapp->setTopWidget(&kbiff);
+    tdeApp->setTopWidget(&kbiff);
 
   kbiff.show();
 
diff --git a/kbiff/notify.cpp b/kbiff/notify.cpp
index 88df859..8487fc2 100644
--- a/kbiff/notify.cpp
+++ b/kbiff/notify.cpp
@@ -24,11 +24,11 @@ KBiffNotify::KBiffNotify(TQWidget *parent_, const int num_new,
 			 const TQString& mailbx)
     : TQDialog(parent_, 0, false, 0)
 {
-    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
     setCaption(i18n("You have new mail!"));
 
     TQLabel *pixmap = new TQLabel(this);
-    pixmap->setPixmap(kapp->icon());
+    pixmap->setPixmap(tdeApp->icon());
     pixmap->setFixedSize(pixmap->sizeHint());
 
     TQLabel *congrats = new TQLabel(i18n("You have new mail!"), this);
diff --git a/kbiff/setupdlg.cpp b/kbiff/setupdlg.cpp
index 17c4fa2..c63b1b7 100644
--- a/kbiff/setupdlg.cpp
+++ b/kbiff/setupdlg.cpp
@@ -68,7 +68,7 @@ KBiffSetup::KBiffSetup(const TQString& profile_, bool secure_)
     : KDialog(0, 0, true)
 {
   // set the icon just to be cute
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   // make sure the profile is *something*
   TQString the_profile;
@@ -303,7 +303,7 @@ bool KBiffSetup::getStatus() const
 
 void KBiffSetup::invokeHelp()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 void KBiffSetup::readConfig(const TQString& profile_)
@@ -1926,7 +1926,7 @@ KBiffAboutTab::KBiffAboutTab(TQWidget *parent_)
   : TQWidget(parent_)
 {
   // load in the kbiff pixmap
-  TQPixmap logo_pixmap(kapp->icon());
+  TQPixmap logo_pixmap(tdeApp->icon());
 
   TQLabel *pixmap_label = new TQLabel(this);
   pixmap_label->setPixmap(logo_pixmap);