From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdesktop/lockeng.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kdesktop/lockeng.h') 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; }; -- cgit v1.2.3