summaryrefslogtreecommitdiffstats
path: root/kdesktop/lockeng.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/lockeng.h
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lockeng.h')
-rw-r--r--kdesktop/lockeng.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index d1133aae6..0643e82c7 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -89,7 +89,7 @@ protected slots:
private slots:
void handleSecureDialog();
- void slotSAKProcessExited();
+ void slotSATDEProcessExited();
/**
* Enable wallpaper exports
@@ -110,7 +110,7 @@ protected:
State mState;
XAutoLock *mXAutoLock;
- KProcess mLockProcess;
+ TDEProcess mLockProcess;
int mTimeout;
// the original X screensaver parameters
@@ -123,7 +123,7 @@ protected:
TQValueVector< DCOPClientTransaction* > mLockTransactions;
private:
- KProcess* mSAKProcess;
+ TDEProcess* mSATDEProcess;
bool mTerminationRequested;
};