From 66faad37caa38d4ffd4dcc4d227b7f7131b31977 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 1 May 2014 13:04:21 +0900
Subject: Temporarily reverted commits ccb5fca, 59ef38d, 710fc43. The code for
 these commits will be pushed again later once a fix for SAK-enabled systems
 has been developed and tested. This relates to bug 1584.

---
 kcontrol/screensaver/scrnsave.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'kcontrol/screensaver/scrnsave.h')

diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index d52c81227..a8f6e53b0 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -60,7 +60,6 @@ protected slots:
     void slotUseTSAK( bool );
     void slotUseUnmanagedLockWindows( bool );
     void slotHideActiveWindowsFromSaver( bool );
-    void slotHideCancelButton( bool );
     void processLockouts();
     void slotSetupDone(TDEProcess*);
     // when selecting a new screensaver, the old preview will
@@ -104,7 +103,6 @@ protected:
     TQCheckBox   *mUseTSAKCheckBox;
     TQCheckBox   *mUseUnmanagedLockWindowsCheckBox;
     TQCheckBox   *mHideActiveWindowsFromSaverCheckBox;
-    TQCheckBox   *mHideCancelButtonCheckBox;
 
     int         mSelected;
     int         mPrevSelected;
@@ -123,7 +121,6 @@ protected:
     bool        mUseTSAK;
     bool        mUseUnmanagedLockWindows;
     bool        mHideActiveWindowsFromSaver;
-    bool        mHideCancelButton;
 
     KSimpleConfig* mTDMConfig;
 };
-- 
cgit v1.2.1