From 3df918cc405b2449b5c98479a0dbd0eb1a23cbe5 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 18 Sep 2011 07:57:55 +0000
Subject: 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
---
 kdesktop/lock/lockprocess.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

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;
 };
-- 
cgit v1.2.1