summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr/krandrtray.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-29 03:42:40 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-29 03:42:40 +0000
commitff4898fd413b863640a3b474ea0bb0c1b699f734 (patch)
treefffbdc7b613cd7dd3e618e1a52221b1b900953e6 /kcontrol/randr/krandrtray.h
parent71519fb37e5d0794a36e28d0c6efe1d197639ccb (diff)
downloadtdebase-ff4898fd413b863640a3b474ea0bb0c1b699f734.tar.gz
tdebase-ff4898fd413b863640a3b474ea0bb0c1b699f734.zip
Revert accidental commit for these two files
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1120416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/randr/krandrtray.h')
-rw-r--r--kcontrol/randr/krandrtray.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index 6a2892a2d..fac91e358 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -21,7 +21,6 @@
#include <qptrlist.h>
-#include <qapplication.h>
#include <ksystemtray.h>
#include <kglobalaccel.h>
@@ -63,9 +62,7 @@ private:
void populateMenu(KPopupMenu* menu);
void addOutputMenu(KPopupMenu* menu);
int GetDefaultResolutionParameter();
-#ifndef QT_XRANDR_FIXES_01
int GetHackResolutionParameter();
-#endif
void findPrimaryDisplay();
bool m_popupUp;