Use tdeApp

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

7 files changed, 11 insertions, 11 deletions

diff --git a/chalk/core/kis_image_iface.cpp b/chalk/core/kis_image_iface.cpp
index 2cc16e27e..f75220341 100644
--- a/chalk/core/kis_image_iface.cpp
+++ b/chalk/core/kis_image_iface.cpp
@@ -79,7 +79,7 @@ DCOPRef KisImageIface::activeDevice()
     if( !dev )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         dev->dcopObject()->objId(),
                         "KisPaintDeviceIface");
 
@@ -91,7 +91,7 @@ DCOPRef KisImageIface::colorSpace() const
     if ( !cs )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         cs->dcopObject()->objId(),
                         "KisColorSpaceIface" );
 }
diff --git a/chalk/core/kis_paint_device_iface.cpp b/chalk/core/kis_paint_device_iface.cpp
index c8afa80a3..6ac3ad1c7 100644
--- a/chalk/core/kis_paint_device_iface.cpp
+++ b/chalk/core/kis_paint_device_iface.cpp
@@ -62,7 +62,7 @@ DCOPRef KisPaintDeviceIface::colorSpace() const
     if ( !cs )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         cs->dcopObject()->objId(),
                         "KisColorSpaceIface" );
 }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index bd5b4a729..1233fc1be 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
@@ -129,9 +129,9 @@ void KisToolZoom::deactivate()
 void KisToolZoom::slotTimer()
 {
 #if KDE_IS_VERSION(3,4,0)
-    int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
+    int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
             |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index 62f014d98..b1a232450 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
@@ -166,9 +166,9 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e)
 void KisToolSelectSimilar::slotTimer()
 {
 #if KDE_IS_VERSION(3,4,0)
-    int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
+    int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
             |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
     enumSelectionMode action;
diff --git a/chalk/ui/kis_doc.cpp b/chalk/ui/kis_doc.cpp
index 5db84839f..9478749c3 100644
--- a/chalk/ui/kis_doc.cpp
+++ b/chalk/ui/kis_doc.cpp
@@ -1120,7 +1120,7 @@ void KisDoc::IODone()
 
 void KisDoc::slotIOProgress(TQ_INT8 percentage)
 {
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
 
     Q_ASSERT(app);
 
diff --git a/chalk/ui/kis_doc_iface.cpp b/chalk/ui/kis_doc_iface.cpp
index ae5a4a581..d93013caa 100644
--- a/chalk/ui/kis_doc_iface.cpp
+++ b/chalk/ui/kis_doc_iface.cpp
@@ -36,7 +36,7 @@ DCOPRef  KisDocIface::currentImage()
     if( !img )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         img->dcopObject()->objId(),
                         "KisImageIface");
 }
diff --git a/chalk/ui/kis_label_progress.cpp b/chalk/ui/kis_label_progress.cpp
index 383b8254d..7cf79ab10 100644
--- a/chalk/ui/kis_label_progress.cpp
+++ b/chalk/ui/kis_label_progress.cpp
@@ -169,7 +169,7 @@ void KisLabelProgress::update(int percent)
 {
     m_bar->setValue(percent);
 
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
 
     app->processEvents();
     // The following is safer, but makes cancel impossible:
@@ -181,7 +181,7 @@ void KisLabelProgress::updateStage(const TQString&, int percent)
 {
     m_bar->setValue(percent);
 
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
     Q_ASSERT(app);
 
     app->processEvents();