Rename a number of classes to enhance compatibility with KDE4

6 files changed, 17 insertions, 17 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index ad687839d..92420e652 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -924,9 +924,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     reconfigure();    // initialize clock widget
     slotUpdate();
 
-    if (kapp->authorizeKAction("kicker_rmb"))
+    if (kapp->authorizeTDEAction("kicker_rmb"))
     {
-        menu = new KPopupMenu();
+        menu = new TDEPopupMenu();
         connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
         connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
         setCustomMenu(menu);
@@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
 
 void ClockApplet::openContextMenu()
 {
-    if (!menu || !kapp->authorizeKAction("kicker_rmb"))
+    if (!menu || !kapp->authorizeTDEAction("kicker_rmb"))
         return;
 
     menu->exec( TQCursor::pos() );
@@ -1544,7 +1544,7 @@ void ClockApplet::aboutToShowContextMenu()
     TQDateTime dt = TQDateTime::currentDateTime();
     dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
 
-    KPopupMenu *copyMenu = new KPopupMenu( menu );
+    TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
     copyMenu->insertItem(loc->formatDateTime(dt), 201);
     copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
     copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
@@ -1558,7 +1558,7 @@ void ClockApplet::aboutToShowContextMenu()
 
     if (!bImmutable)
     {
-        KPopupMenu *zoneMenu = new KPopupMenu( menu );
+        TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu );
         connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
         for (int i = 0; i <= zone->remoteZoneCount(); i++)
         {
@@ -1575,7 +1575,7 @@ void ClockApplet::aboutToShowContextMenu()
         zoneMenu->insertSeparator();
         zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110);
 
-        KPopupMenu *type_menu = new KPopupMenu(menu);
+        TDEPopupMenu *type_menu = new TDEPopupMenu(menu);
         connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
         type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1);
         type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2);
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 34d73cf83..36e5f00bf 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -48,7 +48,7 @@ class TQBoxLayout;
 class DatePicker;
 class TQPixmap;
 class Zone;
-class KPopupMenu;
+class TDEPopupMenu;
 class Prefs;
 class ClockApplet;
 
@@ -342,7 +342,7 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
         bool showDayOfWeek;
         bool m_updateOnTheMinute;
         TQStringList _remotezonelist;
-        KPopupMenu* menu;
+        TDEPopupMenu* menu;
         ClockAppletToolTip m_tooltip;
         KTextShadowEngine *m_shadowEngine;
 };
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 6906808c7..28bcd7185 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -252,7 +252,7 @@
                         <cstring>kcfg_Fuzzyness</cstring>
                     </property>
                 </widget>
-                <widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="2">
+                <widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_FuzzyFont</cstring>
                     </property>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 560ddcc7f..170a830f4 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -291,7 +291,7 @@
                                                 </size>
                                             </property>
                                         </spacer>
-                                        <widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="3">
+                                        <widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="3">
                                             <property name="name">
                                                 <cstring>kcfg_PlainFont</cstring>
                                             </property>
@@ -394,7 +394,7 @@
                                             <string>Font:</string>
                                         </property>
                                     </widget>
-                                    <widget class="KFontRequester">
+                                    <widget class="TDEFontRequester">
                                         <property name="name">
                                             <cstring>kcfg_DateFont</cstring>
                                         </property>
@@ -441,7 +441,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>City</string>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index c43b76db1..f8c2fc59a 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -91,7 +91,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
   return 0;
 }
 
-void Zone::readZoneList(KListView *listView )
+void Zone::readZoneList(TDEListView *listView )
 {
   const KTimezones::ZoneMap zones = m_zoneDb.allZones();
   TQMap<TQString, TQListViewItem*> KontinentMap;
@@ -130,7 +130,7 @@ void Zone::readZoneList(KListView *listView )
   }
 }
 
-void Zone::getSelectedZonelist(KListView *listView)
+void Zone::getSelectedZonelist(TDEListView *listView)
 {
      _remotezonelist.clear();
 
diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h
index caaa112f9..cfe934790 100644
--- a/kicker/applets/clock/zone.h
+++ b/kicker/applets/clock/zone.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstringlist.h>
 
 class TDEConfig;
-class KListView;
+class TDEListView;
 
 class Zone {
 
@@ -48,8 +48,8 @@ public:
 	void nextZone();
 	void prevZone();
 	int calc_TZ_offset(const TQString& zone, bool reset=false);
-	void readZoneList(KListView *listView);
-	void getSelectedZonelist(KListView *listView);
+	void readZoneList(TDEListView *listView);
+	void getSelectedZonelist(TDEListView *listView);
 
 protected:
         KTimezones m_zoneDb;