summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockprocess.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 07:57:55 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 07:57:55 +0000
commit3df918cc405b2449b5c98479a0dbd0eb1a23cbe5 (patch)
tree35402080449f7ab7a455f604e386a15a5420eee9 /kdesktop/lock/lockprocess.h
parent2372baf4c670de9de85fc134fd31c8caaea0f79b (diff)
downloadtdebase-3df918cc405b2449b5c98479a0dbd0eb1a23cbe5.tar.gz
tdebase-3df918cc405b2449b5c98479a0dbd0eb1a23cbe5.zip
Use krootpixmap instead of the external krootbacking executable in kdesktop_lock
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1254228 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/lock/lockprocess.h')
-rw-r--r--kdesktop/lock/lockprocess.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 1b5fa9fbf..a986d42c4 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -13,6 +13,7 @@
#include <kprocess.h>
#include <kpixmap.h>
+#include <krootpixmap.h>
#include <tqwidget.h>
#include <tqtimer.h>
@@ -71,7 +72,7 @@ public slots:
void desktopResized();
void doDesktopResizeFinish();
void doFunctionKeyBroadcast();
- void slotPaintBackground();
+ void slotPaintBackground(const TQPixmap &pm);
protected:
virtual bool x11Event(XEvent *);
@@ -186,6 +187,8 @@ private:
bool mHackStartupEnabled;
TQPixmap backingPixmap;
+ KRootPixmap *m_rootPixmap;
+ int mBackingStartupDelayTimer;
KSMModalDialog* m_startupStatusDialog;
};