Rename a number of classes to enhance compatibility with KDE4

9 files changed, 15 insertions, 15 deletions

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 7187c03..4bbba09 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -286,13 +286,13 @@ void KBinaryClock::updateClock(){
 void KBinaryClock::openContextMenu() {
 		bool bImmutable = config()->isImmutable();
 
-		KPopupMenu *menu = new KPopupMenu();
+		TDEPopupMenu *menu = new TDEPopupMenu();
 		menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
 
 		TDELocale *loc = TDEGlobal::locale();
 		TQDateTime dt = TQDateTime::currentDateTime();
 
-		KPopupMenu *copyMenu = new KPopupMenu( menu );
+		TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
 		copyMenu->insertItem(loc->formatDateTime(dt), 201);
 		copyMenu->insertItem(loc->formatDate(dt.date()), 202);
 		copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 164e1ab..37dd1ca 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -129,7 +129,7 @@ void KolourPicker::slotPick()
 
 void KolourPicker::slotHistory()
 {
-	KPopupMenu popup;
+	TDEPopupMenu popup;
 	popup.insertTitle(SmallIcon("colorize"), i18n("History"));
 	TQPtrList<TQPopupMenu> subMenus;
 	subMenus.setAutoDelete(true);
@@ -284,7 +284,7 @@ void KolourPicker::arrangeButtons()
 
 TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const
 {
-	KPopupMenu *popup = new KPopupMenu;
+	TDEPopupMenu *popup = new TDEPopupMenu;
 	if (title)
 		popup->insertTitle(colorPixmap(c), i18n("Copy Color Value"));
 	TQString value;
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 43c6fe8..1487a81 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -241,7 +241,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
                           "Based on timemon by H. Maierhofer");
 
     hmenu = new KHelpMenu(this, aboutmsg);
-    menu = new KPopupMenu(this);
+    menu = new TDEPopupMenu(this);
 
     menu->insertTitle( SmallIcon( "ktimemon" ), i18n( "System Monitor" ) ) ;
     menu->insertItem(i18n("Horizontal Bars"), 4);
diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h
index 6e454d8..a639b3a 100644
--- a/kicker-applets/ktimemon/timemon.h
+++ b/kicker-applets/ktimemon/timemon.h
@@ -32,7 +32,7 @@ class TQPainter;
 class TDEProcess;
 class KShellProcess;
 class KHelpMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 
 // -- KTimeMon declaration -----------------------------------------------
 
@@ -88,7 +88,7 @@ private:
     unsigned interval;
     bool autoScale;
     unsigned pageScale, swapScale, ctxScale;
-    KPopupMenu* menu;
+    TDEPopupMenu* menu;
     KHelpMenu* hmenu;
     TQTimer* timer;
     KConfDialog *configDialog;
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 7856142..88350fb 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -110,7 +110,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions,
 
 void MathApplet::initContextMenu()
 {
-    mContextMenu = new KPopupMenu(this);
+    mContextMenu = new TDEPopupMenu(this);
     mContextMenu->setCheckable(true);
     mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0);
     mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1);
diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h
index dad1e8c..e8792b9 100644
--- a/kicker-applets/math/mathapplet.h
+++ b/kicker-applets/math/mathapplet.h
@@ -33,7 +33,7 @@ class TQLabel;
 class TQHBox;
 class TQPushButton;
 class KHistoryCombo;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class MathApplet : public KPanelApplet
 {
@@ -68,7 +68,7 @@ private:
     TQLabel         *_label;
     TQPushButton    *_btn;
     TQHBox          *_hbox;
-    KPopupMenu *mContextMenu;
+    TDEPopupMenu *mContextMenu;
     bool m_hasFocus;
 };
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index c320ff9..ec09ddb 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -151,7 +151,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
 
 	reparseConfig();
 
-	rmbMenu = new KPopupMenu(this, "RMBMenu");
+	rmbMenu = new TDEPopupMenu(this, "RMBMenu");
 	rmbMenu->insertTitle(i18n("MediaControl"), 0, 0);
 	rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."),
 		this, TQT_SLOT(preferences()));
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 0704da5..7e1a8ae 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -42,7 +42,7 @@
 #define MEDIACONTROL_VERSION "0.4"
 
 class MCSlider;
-class KPopupMenu;
+class TDEPopupMenu;
 class TDEInstance;
 class MediaControlConfig;
 class TDEAboutData;
@@ -96,7 +96,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
 		TrayButton *next_button;  // GoTo Next Playlist-Item
 		MCSlider *time_slider;
 		int mLastLen, mLastTime, mLastStatus;
-		KPopupMenu *rmbMenu;
+		TDEPopupMenu *rmbMenu;
 
 		virtual void mousePressEvent(TQMouseEvent* e);
 		virtual void moveEvent(TQMoveEvent*);
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index df36762..1f1b835 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -60,7 +60,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="KListBox" row="0" column="0">
+                            <widget class="TDEListBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>playerListBox</cstring>
                                 </property>
@@ -120,7 +120,7 @@
                             <string>&amp;Use themes</string>
                         </property>
                     </widget>
-                    <widget class="KListBox">
+                    <widget class="TDEListBox">
                         <item>
                             <property name="text">
                                 <string>default</string>