From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:50:20 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 ktimer/ktimer.cpp | 10 +++++-----
 ktimer/ktimer.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ktimer')

diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index 62d7460..cff3083 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -299,7 +299,7 @@ struct KTimerJobPrivate {
     bool oneInstance;
     unsigned value;
     KTimerJob::States state;
-    TQPtrList<KProcess> processes;
+    TQPtrList<TDEProcess> processes;
     void *user;
 
     TQTimer *timer;
@@ -487,7 +487,7 @@ void KTimerJob::timeout()
 }
 
 
-void KTimerJob::processExited(KProcess *proc)
+void KTimerJob::processExited(TDEProcess *proc)
 {
     bool ok = proc->exitStatus()==0;
     d->processes.remove( proc );
@@ -502,9 +502,9 @@ void KTimerJob::fire()
         KShellProcess *proc = new KShellProcess;
         (*proc) << d->command;
         d->processes.append( proc );
-        connect( proc, TQT_SIGNAL(processExited(KProcess*)),
-                 TQT_SLOT(processExited(KProcess*)) );
-        bool ok = proc->start( KProcess::NotifyOnExit );
+        connect( proc, TQT_SIGNAL(processExited(TDEProcess*)),
+                 TQT_SLOT(processExited(TDEProcess*)) );
+        bool ok = proc->start( TDEProcess::NotifyOnExit );
         emit fired( this );
         if( !ok ) {
             d->processes.remove( proc );
diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h
index bdb1d00..0a646fb 100644
--- a/ktimer/ktimer.h
+++ b/ktimer/ktimer.h
@@ -81,7 +81,7 @@ class KTimerJob : public TQObject {
 
  private slots:
     void timeout();
-    void processExited(KProcess *proc);
+    void processExited(TDEProcess *proc);
 
  private:
     struct KTimerJobPrivate *d;
-- 
cgit v1.2.1