From ff4898fd413b863640a3b474ea0bb0c1b699f734 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 29 Apr 2010 03:42:40 +0000
Subject: 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
---
 kcontrol/randr/krandrtray.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'kcontrol/randr/krandrtray.h')

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