Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 3 insertions, 3 deletions

diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index e2125cbb..f8b2f78c 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev )
   painter.save();
   painter.setClipRegion(grayRegion, TQPainter::CoordPainter);
   painter.setPen(TQt::NoPen);
-  painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid));
+  painter.fillRect(grayRegion.boundingRect(), TDEApplication::palette().active().brush(TQColorGroup::Mid));
   painter.restore();
   // end of copy...
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index cdc550af..3c45c639 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -1709,7 +1709,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
 #if KDE_IS_VERSION(3, 4, 0)
     if(kapp->keyboardMouseState() & TQt::ControlButton) {
 #else
-    if(KApplication::keyboardModifiers() & KApplication::ControlModifier) {
+    if(TDEApplication::keyboardModifiers() & TDEApplication::ControlModifier) {
 #endif
       pStencil->setFGColor(m_setFGColor->color());
       pStencil->setBGColor(m_setBGColor->color());
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 30cf7f1f..572936e7 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView()
 
   KivioScreenPainter kpainter;
   kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
-  kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid));
+  kpainter.painter()->fillRect(rect, TDEApplication::palette().active().brush(TQColorGroup::Mid));
 
   kpainter.painter()->fillRect(px0, py0, pw, ph, white);