summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr/tderandrtray.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 15:11:21 -0600
committerTimothy Pearson <[email protected]>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /kcontrol/randr/tderandrtray.h
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kcontrol/randr/tderandrtray.h')
-rw-r--r--kcontrol/randr/tderandrtray.h12
1 files changed, 6 insertions, 6 deletions
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;