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

---
 kmrml/kmrml/server/watcher.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kmrml/kmrml/server/watcher.h')

diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h
index 00338480..e9cc0656 100644
--- a/kmrml/kmrml/server/watcher.h
+++ b/kmrml/kmrml/server/watcher.h
@@ -54,7 +54,7 @@ namespace KMrml
         uint timeout;
         TQStrList apps;
         int restartOnFailure;
-        KProcess *process;
+        TDEProcess *process;
         TQTimer *timer;
     };
 
@@ -90,14 +90,14 @@ namespace KMrml
 
     private:
         void unrequireDaemon( DaemonData *daemon, const TQCString& clientAppId);
-        DaemonData *findDaemonFromProcess( KProcess *proc );
+        DaemonData *findDaemonFromProcess( TDEProcess *proc );
         DaemonData *findDaemonFromTimer( TQTimer *timer );
 
         void emitExited( DaemonData *daemon );
         void emitFailure( DaemonData *daemon );
 
     private slots:
-        void slotProcExited( KProcess *proc );
+        void slotProcExited( TDEProcess *proc );
         void slotAppUnregistered( const TQCString& appId );
 
         TQDict<DaemonData> m_daemons;
-- 
cgit v1.2.3