From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:11:21 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 kcontrol/randr/tderandrtray.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 6c96203e4..aee432b4a 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -28,7 +28,7 @@
 #include <tdehardwaredevices.h>
 
 class KHelpMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class KRandRSystemTray :  public KSystemTray, public KRandrSimpleAPI
 {
@@ -38,7 +38,7 @@ public:
 	KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
 	TDEGlobalAccel *globalKeys;
 
-	virtual void contextMenuAboutToShow(KPopupMenu* menu);
+	virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
 
 	void configChanged();
 
@@ -64,8 +64,8 @@ protected:
 	void resizeEvent ( TQResizeEvent * );
 
 private:
-	void populateMenu(KPopupMenu* menu);
-	void addOutputMenu(KPopupMenu* menu);
+	void populateMenu(TDEPopupMenu* menu);
+	void addOutputMenu(TDEPopupMenu* menu);
 	int GetDefaultResolutionParameter();
 	int GetHackResolutionParameter();
 	void findPrimaryDisplay();
@@ -73,7 +73,7 @@ private:
 
 	bool m_popupUp;
 	KHelpMenu* m_help;
-	TQPtrList<KPopupMenu> m_screenPopups;
+	TQPtrList<TDEPopupMenu> m_screenPopups;
 
 	Display *randr_display;
 	ScreenInfo *randr_screen_info;
@@ -82,7 +82,7 @@ private:
 	int last_known_x;
 	int last_known_y;
 
-	KPopupMenu* m_menu;
+	TDEPopupMenu* m_menu;
 	KSimpleConfig *r_config;
 	KSimpleConfig *t_config;
 
-- 
cgit v1.2.1