Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 26 insertions, 26 deletions

diff --git a/src/libs/dialogs/ctrlpaneldlg.cpp b/src/libs/dialogs/ctrlpaneldlg.cpp
index 450d380f..9d218a99 100644
--- a/src/libs/dialogs/ctrlpaneldlg.cpp
+++ b/src/libs/dialogs/ctrlpaneldlg.cpp
@@ -101,7 +101,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
                           i18n("&Save As..."),
                           i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     
     d = new CtrlPanelDlgPriv;
@@ -143,7 +143,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
     // -------------------------------------------------------------
 
     TQTimer::singleShot(0, this, TQ_SLOT(slotInit()));
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 CtrlPanelDlg::~CtrlPanelDlg()
@@ -228,7 +228,7 @@ void CtrlPanelDlg::slotCancel()
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
     
     saveDialogSize(d->name + TQString(" Tool Dialog"));
@@ -242,7 +242,7 @@ void CtrlPanelDlg::closeEvent(TQCloseEvent *e)
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
 
     saveDialogSize(d->name + TQString(" Tool Dialog"));
@@ -271,7 +271,7 @@ void CtrlPanelDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
@@ -334,7 +334,7 @@ void CtrlPanelDlg::slotOk()
     enableButton(User3,   false);
     enableButton(Try,     false);
     enableButton(Default, false);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_imagePreviewWidget->setProgress(0);
 
     if (m_threadedFilter)
@@ -376,7 +376,7 @@ void CtrlPanelDlg::customEvent(TQCustomEvent *event)
               {
                  DDebug() << "Final" << d->name << " completed..." << endl;
                  putFinalData();
-                 kapp->restoreOverrideCursor();
+                 tdeApp->restoreOverrideCursor();
                  accept();
                  break;
               }
diff --git a/src/libs/dialogs/dprogressdlg.cpp b/src/libs/dialogs/dprogressdlg.cpp
index d4b0dc29..935b9f65 100644
--- a/src/libs/dialogs/dprogressdlg.cpp
+++ b/src/libs/dialogs/dprogressdlg.cpp
@@ -94,7 +94,7 @@ DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption)
     vlay->addWidget(d->title);
     vlay->addStretch();
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     d->logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));
 
     d->actionsList->addColumn("Thumb");   // no i18n here: hiden column
diff --git a/src/libs/dialogs/imagedialog.cpp b/src/libs/dialogs/imagedialog.cpp
index d052a2af..f56a6d91 100644
--- a/src/libs/dialogs/imagedialog.cpp
+++ b/src/libs/dialogs/imagedialog.cpp
@@ -229,7 +229,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix)
 
 void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/)
 {
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     d->imageLabel->setPixmap(iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, 128,
                              TDEIcon::DefaultState, 0, true));
 }
diff --git a/src/libs/dialogs/imagedlgbase.cpp b/src/libs/dialogs/imagedlgbase.cpp
index 61666406..3bdb8725 100644
--- a/src/libs/dialogs/imagedlgbase.cpp
+++ b/src/libs/dialogs/imagedlgbase.cpp
@@ -103,7 +103,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name,
                           i18n("&Save As..."),
                           i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     showButton(User1, false);
 
@@ -143,7 +143,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name,
     d->mainLayout->setColStretch(0, 10);
     d->mainLayout->setRowStretch(2, 10);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 ImageDlgBase::~ImageDlgBase()
@@ -160,7 +160,7 @@ ImageDlgBase::~ImageDlgBase()
 
 void ImageDlgBase::readSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     if(config->hasKey("SplitterSizes"))
         d->splitter->setSizes(config->readIntListEntry("SplitterSizes"));
@@ -170,7 +170,7 @@ void ImageDlgBase::readSettings(void)
 
 void ImageDlgBase::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     config->writeEntry("SplitterSizes", d->splitter->sizes());
     config->sync();
@@ -208,7 +208,7 @@ void ImageDlgBase::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
diff --git a/src/libs/dialogs/imageguidedlg.cpp b/src/libs/dialogs/imageguidedlg.cpp
index 9713a872..01937d8f 100644
--- a/src/libs/dialogs/imageguidedlg.cpp
+++ b/src/libs/dialogs/imageguidedlg.cpp
@@ -136,7 +136,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
                            i18n("&Save As..."),
                            i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     
     d = new ImageGuideDlgPriv;
@@ -253,7 +253,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
     d->settingsSideBar->loadViewState();
     
     // Reading splitter sizes here prevent flicker effect in dialog.
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     if(config->hasKey("SplitterSizes"))
         d->splitter->setSizes(config->readIntListEntry("SplitterSizes"));
@@ -261,7 +261,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
     // -------------------------------------------------------------
 
     TQTimer::singleShot(0, this, TQ_SLOT(slotInit()));
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 ImageGuideDlg::~ImageGuideDlg()
@@ -282,7 +282,7 @@ ImageGuideDlg::~ImageGuideDlg()
 void ImageGuideDlg::readSettings(void)
 {
     TQColor defaultGuideColor(TQt::red);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     d->guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor));
     d->guideSize->setValue(config->readNumEntry("Guide Width", 1));
@@ -292,7 +292,7 @@ void ImageGuideDlg::readSettings(void)
 
 void ImageGuideDlg::writeSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     config->writeEntry( "Guide Color", d->guideColorBt->color() );
     config->writeEntry( "Guide Width", d->guideSize->value() );
@@ -401,7 +401,7 @@ void ImageGuideDlg::slotCancel()
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
     
     writeSettings();
@@ -415,7 +415,7 @@ void ImageGuideDlg::closeEvent(TQCloseEvent *e)
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
 
     writeSettings();
@@ -428,7 +428,7 @@ void ImageGuideDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
@@ -487,7 +487,7 @@ void ImageGuideDlg::slotOk()
     enableButton(User3,   false);
     enableButton(Default, false);
     enableButton(Try,     false);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     d->progressBar->setValue(0);
 
     if (m_threadedFilter)
@@ -529,7 +529,7 @@ void ImageGuideDlg::customEvent(TQCustomEvent *event)
                 {
                     DDebug() << "Final" << d->name << " completed..." << endl;
                     putFinalData();
-                    kapp->restoreOverrideCursor();
+                    tdeApp->restoreOverrideCursor();
                     accept();
                     break;
                 }
diff --git a/src/libs/dialogs/rawcameradlg.cpp b/src/libs/dialogs/rawcameradlg.cpp
index 298b47d4..0323c19e 100644
--- a/src/libs/dialogs/rawcameradlg.cpp
+++ b/src/libs/dialogs/rawcameradlg.cpp
@@ -93,9 +93,9 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
 
-    if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
+    if (tdeApp->aboutData()->appName() == TQString("digikam"))
         logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));
     else
         logo->setPixmap(iconLoader->loadIcon("showfoto", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));