4 files changed, 22 insertions, 22 deletions

diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 561732078..9ec755834 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -35,7 +35,7 @@
 
 class TDEGlobalAccel;
 class KKeyChooser;
-class KListView;
+class TDEListView;
 class TQPushButton;
 class TQDialog;
 class ConfigDialog;
@@ -56,11 +56,11 @@ private:
 
 };
 
-class ListView : public KListView
+class ListView : public TDEListView
 {
 public:
     ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
-	: KListView( parent, name ), _configWidget( configWidget ),
+	: TDEListView( parent, name ), _configWidget( configWidget ),
           _regExpEditor(0L) {}
     // TQListView has a weird idea of a sizeHint...
     virtual TQSize sizeHint () const {
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index b7df41602..07702633b 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -28,7 +28,7 @@
 
 	keys->insert( "Program:tderandrtray", i18n("Display Control") );
 
-	DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
+	DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() );
 
 #undef DEF
 #undef WIN
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 42151d87e..845f3e498 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -223,7 +223,7 @@ void KRandRSystemTray::reloadDisplayConfiguration()
 	}
 }
 
-void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
+void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 {
 	int lastIndex = 0;
 
@@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 				/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
 				menu->setItemEnabled(lastIndex, false);*/
 			} else {
-				KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
+				TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
 				m_screenPopups.append(subMenu);
 				populateMenu(subMenu);
 				lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
@@ -293,23 +293,23 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 
 	menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation"));
 
-	KAction *actColors = new KAction( i18n( "Configure Displays..." ),
-		SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
+	TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
+		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
 		actionCollection() );
 	actColors->plug( menu );
 
-// 	KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
-// 		SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ),
+// 	TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
+// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
 // 		actionCollection() );
 // 	actPrefs->plug( menu );
 
-	KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ),
-		SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
+	TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
+		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
 		actionCollection() );
 	actSKeys->plug( menu );
 
 	menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu());
-	KAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
+	TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
 	quitAction->plug(menu);
 
 	m_menu = menu;
@@ -317,7 +317,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 
 void KRandRSystemTray::slotScreenActivated()
 {
-	setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender())));
+	setCurrentScreen(m_screenPopups.find(static_cast<const TDEPopupMenu*>(sender())));
 }
 
 void KRandRSystemTray::configChanged()
@@ -391,7 +391,7 @@ int KRandRSystemTray::GetHackResolutionParameter() {
 	return resparm;
 }
 
-void KRandRSystemTray::populateMenu(KPopupMenu* menu)
+void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 {
 	int lastIndex = 0;
 
@@ -718,7 +718,7 @@ void KRandRSystemTray::findPrimaryDisplay()
 	}
 }
 
-void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
+void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 {
 	XRROutputInfo *output_info;
 	char *output_name;
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;