summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockprocess.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/lock/lockprocess.h
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lock/lockprocess.h')
-rw-r--r--kdesktop/lock/lockprocess.h6
1 files changed, 3 insertions, 3 deletions
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
{