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

---
 karm/main.cpp         |  2 +-
 karm/taskview.cpp     | 14 +++++++-------
 karm/test/locking.cpp |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'karm')

diff --git a/karm/main.cpp b/karm/main.cpp
index e8ebc7e1..f2fab8fc 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -49,7 +49,7 @@ int main( int argc, char *argv[] )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication myApp;
+  TDEApplication myApp;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 3852fda9..eb63da48 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -820,16 +820,16 @@ void TaskView::clipTotals()
         i18n("Copy This Task"), i18n("Copy All Tasks") );
     if (response == KMessageBox::Yes) // This task only
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
     }
     else // All tasks
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
     }
   }
   else
   {
-    KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+    TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
   }
 }
 
@@ -844,16 +844,16 @@ void TaskView::clipSession()
         i18n("Copy This Task"), i18n("Copy All Tasks") );
     if (response == KMessageBox::Yes) // this task only
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
     }
     else // only task
     {
-      KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
+      TDEApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
     }
   }
   else
   {
-    KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+    TDEApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
   }
 }
 
@@ -863,7 +863,7 @@ void TaskView::clipHistory()
   if (dialog.exec()== TQDialog::Accepted)
   {
     TimeKard t;
-    KApplication::clipboard()->
+    TDEApplication::clipboard()->
       setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) );
   }
 }
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 6f9cd183..ac1de23e 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -136,11 +136,11 @@ int main( int argc, char *argv[] )
   setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   TDECmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   // basic libkcal locking stuff
   if ( !rval ) rval = test1();
-- 
cgit v1.2.3