From 98ed486e2f25cfd58e6cc036862bcac0e988f361 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:14:36 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kmag/kmag.cpp         | 2 +-
 kmag/kmag.h           | 2 +-
 kmag/kmagzoomview.cpp | 6 +++---
 kmag/main.cpp         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kmag')

diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index f345f8e..3feea65 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -864,7 +864,7 @@ void KmagApp::slotFileQuit()
 
 void KmagApp::copyToClipBoard()
 {
-  TQClipboard *cb=KApplication::clipboard();
+  TQClipboard *cb=TDEApplication::clipboard();
   cb->setPixmap(m_zoomView->getPixmap());
 }
 
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 995a6d2..51de1b8 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -48,7 +48,7 @@
   * KmagApp reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as using KActions.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index a490de8..2a26b2c 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -133,7 +133,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name)
     m_invert(false),
     m_fitToWindow(true)
 {
-  KApplication::setGlobalMouseTracking(TRUE);
+  TDEApplication::setGlobalMouseTracking(TRUE);
   viewport()->setMouseTracking(TRUE);
   viewport()->setBackgroundMode (NoBackground);
   viewport()->setFocusPolicy(TQ_StrongFocus);
@@ -167,7 +167,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name)
 
 KMagZoomView::~KMagZoomView()
 {
-  KApplication::setGlobalMouseTracking(FALSE);
+  TDEApplication::setGlobalMouseTracking(FALSE);
 }
 
 /**
@@ -307,7 +307,7 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
     {    
       // 3. Actual cursor
       // Get the current cursor type
-      TQWidget *dummy  = KApplication::widgetAt(TQCursor::pos(), FALSE);
+      TQWidget *dummy  = TDEApplication::widgetAt(TQCursor::pos(), FALSE);
       if(!dummy)
         break;
       kdDebug() << ">" << dummy->name() << ":" << dummy->cursor().shape() << "-" << endl;
diff --git a/kmag/main.cpp b/kmag/main.cpp
index a543029..1111722 100644
--- a/kmag/main.cpp
+++ b/kmag/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init( argc, argv, aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
 
   if (app.isRestored())
   {
-- 
cgit v1.2.1