3 files changed, 16 insertions, 16 deletions

diff --git a/src/utilities/imageeditor/editor/editortool.cpp b/src/utilities/imageeditor/editor/editortool.cpp
index b840e673..9117a780 100644
--- a/src/utilities/imageeditor/editor/editortool.cpp
+++ b/src/utilities/imageeditor/editor/editortool.cpp
@@ -331,7 +331,7 @@ void EditorToolThreaded::customEvent(TQCustomEvent *e)
                     DDebug() << "Final" << toolName() << " completed..." << endl;
                     putFinalData();
                     EditorToolIface::editorToolIface()->setToolStopProgress();
-                    kapp->restoreOverrideCursor();
+                    tdeApp->restoreOverrideCursor();
                     emit okClicked();
                     break;
                 }
@@ -388,7 +388,7 @@ void EditorToolThreaded::slotOk()
     toolSettings()->enableButton(EditorToolSettings::Try,     false);
 
     EditorToolIface::editorToolIface()->setToolStartProgress(d->progressMess.isEmpty() ? toolName() : d->progressMess);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     if (d->threadedFilter)
     {
@@ -429,7 +429,7 @@ void EditorToolThreaded::slotCancel()
 {
     writeSettings();
     slotAbort();
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     emit cancelClicked();
 }
 
diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp
index eed7cfea..657a0eae 100644
--- a/src/utilities/imageeditor/editor/editorwindow.cpp
+++ b/src/utilities/imageeditor/editor/editorwindow.cpp
@@ -618,7 +618,7 @@ void EditorWindow::printImage(KURL url)
     DImg image(w, h, sixteenBit, hasAlpha, ptr);
 
     KPrinter printer;
-    TQString appName = TDEApplication::kApplication()->aboutData()->appName();
+    TQString appName = tdeApp->aboutData()->appName();
     printer.setDocName( url.filename() );
     printer.setCreator( appName );
 #if KDE_IS_VERSION(3,2,0)
@@ -837,7 +837,7 @@ void EditorWindow::unLoadImagePlugins()
 
 void EditorWindow::readStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     // Restore full screen Mode ?
@@ -856,7 +856,7 @@ void EditorWindow::readStandardSettings()
 
 void EditorWindow::applyStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     // -- Settings for Color Management stuff ----------------------------------------------
 
@@ -966,7 +966,7 @@ void EditorWindow::applyStandardSettings()
 
 void EditorWindow::saveStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     config->writeEntry("AutoZoom", d->zoomFitToWindowAction->isChecked());
@@ -1557,7 +1557,7 @@ bool EditorWindow::startingSaveAs(const KURL& url)
     imageFileSaveDialog.setFilter(mimetypes);
 
     TQFileInfo info(m_savingContext->srcURL.fileName());
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     TQString ext      = config->readEntry("LastSavedImageTypeMime", "png");
     TQString fileName = info.baseName(false) + TQString(".") + ext;
@@ -1763,7 +1763,7 @@ void EditorWindow::slotToggleColorManagedView()
         // Save Color Managed View setting in config file. For performance
         // reason, no need to flush file, it cached in memory and will be flushed
         // to disk at end of session.
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("Color Management");
         config->writeEntry("ManagedView", cmv);
     }
@@ -1839,17 +1839,17 @@ void EditorWindow::setOverExposureToolTip(bool oei)
 
 void EditorWindow::slotDonateMoney()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void EditorWindow::slotContribute()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void EditorWindow::slotToggleSlideShow()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false);
 
@@ -1886,7 +1886,7 @@ void EditorWindow::slotThemeChanged()
 
     m_themeMenuAction->setCurrentItem(index);
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     if (!config->readBoolEntry("UseThemeBackgroundColor", true))
diff --git a/src/utilities/imageeditor/editor/imagewindow.cpp b/src/utilities/imageeditor/editor/imagewindow.cpp
index 2c10a6f6..94dc584b 100644
--- a/src/utilities/imageeditor/editor/imagewindow.cpp
+++ b/src/utilities/imageeditor/editor/imagewindow.cpp
@@ -772,7 +772,7 @@ bool ImageWindow::setup(bool iccSetupPage)
     if (setup.exec() != TQDialog::Accepted)
         return false;
 
-    kapp->config()->sync();
+    tdeApp->config()->sync();
 
     applySettings();
     return true;
@@ -1084,7 +1084,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
             settings.pictInfoMap.insert(info->kurl(), pictInfo);
 
             m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     else
@@ -1106,7 +1106,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
             settings.pictInfoMap.insert(*it, pictInfo);
 
             m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }