Use tdeAppHEADmaster

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

6 files changed, 14 insertions, 14 deletions

diff --git a/src/tdebluez/devicesetupwizard.cpp b/src/tdebluez/devicesetupwizard.cpp
index c4e15d0..5bd85e6 100644
--- a/src/tdebluez/devicesetupwizard.cpp
+++ b/src/tdebluez/devicesetupwizard.cpp
@@ -508,7 +508,7 @@ void DeviceSetupWizard::slotAsyncErrorResponseDetected(int asyncCallId, const TQ
 //            .arg(error.message()),
 //            TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton);
 
-    KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+    KNotifyClient::event(tdeApp->mainWidget()->winId(),
             "ConnectionError", i18n("AsyncErrorResponseDetected: %1\n%2\n%3")
                         .arg(error.type())
                         .arg(error.name())
diff --git a/src/tdebluez/devicewizard.cpp b/src/tdebluez/devicewizard.cpp
index 26b1de6..a746864 100644
--- a/src/tdebluez/devicewizard.cpp
+++ b/src/tdebluez/devicewizard.cpp
@@ -755,7 +755,7 @@ void DeviceWizard::slotAsyncErrorResponseDetected(int asyncCallId, const TQT_DBu
     connectButton->setText(i18n("C&onnect"));
     setStateDeviceButtons(true);
 
-    KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+    KNotifyClient::event(tdeApp->mainWidget()->winId(),
             "ConnectionError", i18n("AsyncErrorResponseDetected: %1\n%2\n%3")
                         .arg(dbuserr.type())
                         .arg(dbuserr.name())
diff --git a/src/tdebluez/main.cpp b/src/tdebluez/main.cpp
index e2cea55..59ad78a 100644
--- a/src/tdebluez/main.cpp
+++ b/src/tdebluez/main.cpp
@@ -71,7 +71,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
                                       "Restart dbus and the bluetooth service"));
         // debug message for testing
         std::cerr << i18n("Can't connect to DBus!\n").local8Bit();
-        TDEUniqueApplication::kApplication()->quit();
+        TDEUniqueApplication::tdeApplication()->quit();
         return 0;
     }
     else
diff --git a/src/tdebluez/trayicon.cpp b/src/tdebluez/trayicon.cpp
index 2e0ee05..80b0449 100644
--- a/src/tdebluez/trayicon.cpp
+++ b/src/tdebluez/trayicon.cpp
@@ -44,7 +44,7 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
     app = _app;
 
     iconConnectingBlinkState = false;
-    helpMenu = new KHelpMenu(this, TDEApplication::kApplication()->aboutData());
+    helpMenu = new KHelpMenu(this, tdeApp->aboutData());
 
     adapterConfigDialog = new AdapterConfigDialog(app);
     deviceWizard = new DeviceWizard(app);
@@ -359,7 +359,7 @@ void TrayIcon::updateIcon()
         setPixmap(iconNoAdapter);
         updateTooltip(i18n("No BT adapter"));
         if (!this->isHidden())
-            KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+            KNotifyClient::event(tdeApp->mainWidget()->winId(),
                 "AdapterDetached", i18n("<b>No BT adapter available.</b><br/>(BT adapter removed)"));
 
         adapterConfigAction->setEnabled(false);
@@ -562,13 +562,13 @@ void TrayIcon::slotPowerOnChanged(const TQString &adapter, bool state)
     TQString msg;
     if (state)
     {
-        KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+        KNotifyClient::event(tdeApp->mainWidget()->winId(),
                 "AdapterAvailable", i18n("BT adapter <b>%1</b> is on<br/>(<b>%2</b>)").arg(name).arg(addr));
         msg = i18n("Power off [%1]").arg(name);
     }
     else
     {
-        KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+        KNotifyClient::event(tdeApp->mainWidget()->winId(),
                 "AdapterAvailable", i18n("BT adapter <b>%1</b> is off<br/>(<b>%2</b>)").arg(name).arg(addr));
         msg = i18n("Power on [%1]").arg(name);
     }
@@ -590,12 +590,12 @@ void TrayIcon::slotDeviceConnectedChanged(const TQString& path, bool state)
         tqDebug(i18n("Adapter getAddress failed: %1").arg(dbuserr.message()));
     if (state)
     {
-        KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+        KNotifyClient::event(tdeApp->mainWidget()->winId(),
                 "IncomingConnection", i18n("Connected to <b>%1</b> (<b>%2</b>)").arg(name).arg(address));
     }
     else
     {
-        KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+        KNotifyClient::event(tdeApp->mainWidget()->winId(),
                 "IncomingConnection", i18n("Disconnected from <b>%1</b> (<b>%2</b>)").arg(name).arg(address));
     }
     updateIcon();
@@ -652,7 +652,7 @@ void TrayIcon::slotShowHelp()
     // TODO: This is surely not the correct way to jump to the
     // right chapter. Do I really have to mention the html-file,
     // or is the id enough?
-    TDEApplication::kApplication()->invokeHelp("", HELP_DOCUMENT);
+    tdeApp->invokeHelp("", HELP_DOCUMENT);
 }
 
 void TrayIcon::slotAddAdapter(const TQString& path)
@@ -685,7 +685,7 @@ void TrayIcon::slotAddAdapter(const TQString& path)
     showPowerOnActionMap.insert(path, ad_a);
     connect(ad_a, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPowerOn(bool)));
 
-    KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+    KNotifyClient::event(tdeApp->mainWidget()->winId(),
             "AdapterAttached", i18n("BT adapter <b>%1</b> attached<br/>(<b>%2</b>)").arg(name).arg(addr));
 
     if(!powered) // find out if we have some powered adapter
@@ -726,7 +726,7 @@ void TrayIcon::slotRemoveAdapter(const TQString& path)
         showPowerOnActionMap[path]->unplug(contextMenu());
     showPowerOnActionMap.remove(path);
 
-    KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
+    KNotifyClient::event(tdeApp->mainWidget()->winId(),
             "AdapterDetached", i18n("BT adapter detached"));
 
     if (showPowerOnActionMap.isEmpty())
diff --git a/src/tdebluezauth/main.cpp b/src/tdebluezauth/main.cpp
index 086aaa9..8c2a198 100644
--- a/src/tdebluezauth/main.cpp
+++ b/src/tdebluezauth/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     {
         KMessageBox::error(NULL,i18n("Can't connect to DBus!\nUnable to start tdebluezauth.\n\n"
                                      "Restart dbus and the bluetooth service"));
-        TDEUniqueApplication::kApplication()->quit();
+        TDEUniqueApplication::tdeApplication()->quit();
         return -1;
     }
     else
diff --git a/src/tdebluezioclient/commandhandler.cpp b/src/tdebluezioclient/commandhandler.cpp
index 0de5254..df447cf 100644
--- a/src/tdebluezioclient/commandhandler.cpp
+++ b/src/tdebluezioclient/commandhandler.cpp
@@ -395,7 +395,7 @@ void CommandHandler::slotFinished(TDEIO::Job* job)
 
     if (!iterate)
     {
-        TDEApplication::kApplication()->exit(job->error());
+        tdeApp->exit(job->error());
     }
 }