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

---
 kdesktop/lock/lockprocess.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kdesktop/lock/lockprocess.h')

diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index c5b72de80..1694a0eb4 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -86,7 +86,7 @@ protected:
     virtual void resizeEvent(TQResizeEvent *);
 
 private slots:
-    void hackExited(KProcess *);
+    void hackExited(TDEProcess *);
     void signalPipeSignal();
     bool startLock();
     void suspend();
@@ -136,7 +136,7 @@ private:
     int         mLockGrace;
     int         mPriority;
     bool        mBusy;
-    KProcess    mHackProc;
+    TDEProcess    mHackProc;
     int         mRootWidth;
     int         mRootHeight;
     TQString     mSaverExec;
@@ -168,7 +168,7 @@ private:
 
     TQTimer      *hackResumeTimer;
 
-    KProcess*   mVkbdProcess;
+    TDEProcess*   mVkbdProcess;
     KWinModule* mKWinModule;
     struct VkbdWindow
         {
-- 
cgit v1.2.1