Rename KApplication to TDEApplication to avoid conflicts with KDE4

6 files changed, 9 insertions, 9 deletions

diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index e7c61e650..f93899974 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -391,7 +391,7 @@ void KisImagePipeBrush::selectNextBrush(const KisPaintInformation& info) const {
             case KisPipeBrushParasite::Incremental:
                 index = (index + 1) % m_parasite.rank[i]; break;
             case KisPipeBrushParasite::Random:
-                index = int(float(m_parasite.rank[i])*KApplication::random() / RAND_MAX); break;
+                index = int(float(m_parasite.rank[i])*TDEApplication::random() / RAND_MAX); break;
             case KisPipeBrushParasite::Pressure:
                 index = static_cast<int>(info.pressure * (m_parasite.rank[i] - 1) + 0.5); break;
             case KisPipeBrushParasite::Angular:
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index f866e5e29..eda09f6ef 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -131,8 +131,8 @@ void KisToolZoom::slotTimer()
 #if KDE_IS_VERSION(3,4,0)
     int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier
-            |KApplication::ControlModifier|KApplication::Modifier1);
+    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+            |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
 
     if (state & TQt::ControlButton) {
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index 58db0dad1..9eb795ba4 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -168,8 +168,8 @@ void KisToolSelectSimilar::slotTimer()
 #if KDE_IS_VERSION(3,4,0)
     int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier
-            |KApplication::ControlModifier|KApplication::Modifier1);
+    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+            |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
     enumSelectionMode action;
 
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 6d74a63e7..21c4112ba 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
       "nhasan@kde.org" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   KImageIO::registerFormats();
 
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 02699d67f..ee8c65a71 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -1120,7 +1120,7 @@ void KisDoc::IODone()
 
 void KisDoc::slotIOProgress(TQ_INT8 percentage)
 {
-    KApplication *app = KApplication::kApplication();
+    TDEApplication *app = TDEApplication::kApplication();
 
     Q_ASSERT(app);
 
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index c081111f0..d58e4b4be 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -169,7 +169,7 @@ void KisLabelProgress::update(int percent)
 {
     m_bar->setValue(percent);
 
-    KApplication *app = KApplication::kApplication();
+    TDEApplication *app = TDEApplication::kApplication();
 
     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);
 
-    KApplication *app = KApplication::kApplication();
+    TDEApplication *app = TDEApplication::kApplication();
     Q_ASSERT(app);
 
     app->processEvents();