Use tdeApprename/tdeapp

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

4 files changed, 10 insertions, 10 deletions

diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp
index e7ed3ee..76e2a5f 100644
--- a/kftpgrabber/src/mainwindow.cpp
+++ b/kftpgrabber/src/mainwindow.cpp
@@ -105,7 +105,7 @@ MainWindow::MainWindow()
 
   // Set the shell's ui resource file
   setXMLFile("kftpgrabberui.rc");
-  connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()), this, TQ_SLOT(appShutdown()));
+  connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(appShutdown()));
 
   // Restore size and position
   resize(KFTPCore::Config::size());
@@ -188,7 +188,7 @@ void MainWindow::appShutdown()
 
 bool MainWindow::queryClose()
 {
-  if(TDEApplication::kApplication()->sessionSaving()) {
+  if(tdeApp->sessionSaving()) {
     m_actions->m_closeApp = true;
   }
 
@@ -201,8 +201,8 @@ bool MainWindow::queryClose()
 
     // Compute size and position of the pixmap to be grabbed:
     TQPoint g = KFTPWidgets::SystemTray::self()->mapToGlobal(KFTPWidgets::SystemTray::self()->pos());
-    int desktopWidth  = kapp->desktop()->width();
-    int desktopHeight = kapp->desktop()->height();
+    int desktopWidth  = tdeApp->desktop()->width();
+    int desktopHeight = tdeApp->desktop()->height();
     int tw = KFTPWidgets::SystemTray::self()->width();
     int th = KFTPWidgets::SystemTray::self()->height();
     int w = desktopWidth / 4;
diff --git a/kftpgrabber/src/misc/filter.cpp b/kftpgrabber/src/misc/filter.cpp
index 245226d..81582ce 100644
--- a/kftpgrabber/src/misc/filter.cpp
+++ b/kftpgrabber/src/misc/filter.cpp
@@ -239,7 +239,7 @@ Filters::~Filters()
 void Filters::save()
 {
   int num = 0;
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   
   config->setGroup("Filters");
   config->writeEntry("count", count());
@@ -299,7 +299,7 @@ void Filters::save()
 void Filters::load()
 {
   int num = 0;
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   
   config->setGroup("Filters");
   num = config->readNumEntry("count");
diff --git a/kftpgrabber/src/misc/misc.cpp b/kftpgrabber/src/misc/misc.cpp
index bcd007b..fbaac03 100644
--- a/kftpgrabber/src/misc/misc.cpp
+++ b/kftpgrabber/src/misc/misc.cpp
@@ -157,7 +157,7 @@ TQString path2Dir(const TQString &path)
 
 TQString genID()
 {
-  return kapp->randomString(5);
+  return tdeApp->randomString(5);
 }
 
 TQString encodePassword(const TQString& password)
@@ -172,7 +172,7 @@ TQString decodePassword(const TQString& password)
 
 TDEConfig *config(const TQString &section)
 {
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup(section);
   
   return conf;
diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp
index c0615c8..5d91cc4 100644
--- a/kftpgrabber/src/widgets/queueview/queueview.cpp
+++ b/kftpgrabber/src/widgets/queueview/queueview.cpp
@@ -477,12 +477,12 @@ QueueView::QueueView(TQWidget *parent, const char *name)
 
 void QueueView::saveLayout()
 {
-  m_queue->saveLayout(kapp->config(), "queueViewLayout");
+  m_queue->saveLayout(tdeApp->config(), "queueViewLayout");
 }
 
 void QueueView::loadLayout()
 {
-  m_queue->restoreLayout(kapp->config(), "queueViewLayout");
+  m_queue->restoreLayout(tdeApp->config(), "queueViewLayout");
 }
 
 void QueueView::initToolBar()