Rename a number of classes to enhance compatibility with KDE4

56 files changed, 184 insertions, 184 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;
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 0563dbb20..c66f4ceb8 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -143,7 +143,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
 }
 
 
-QuickButton::QuickButton(const TQString &u, KAction* configAction, 
+QuickButton::QuickButton(const TQString &u, TDEAction* configAction, 
                          TQWidget *parent, const char *name) : 
      SimpleButton(parent, name, KickerSettings::showDeepButtons()),
      m_flashCounter(0),
@@ -174,8 +174,8 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
     _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), 
             this, TQT_SLOT(removeApp()));
 
-    m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"),
-        KShortcut(), TQT_TQOBJECT(this));
+    m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
+        TDEShortcut(), TQT_TQOBJECT(this));
     connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), 
         this, TQT_SLOT(slotStickyToggled(bool)));
     m_stickyAction->plug(_popup, 2);
diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index d4f5be29e..4629093cc 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "simplebutton.h"
 
 class TQPopupMenu;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 
 class QuickURL {
 public:
@@ -71,7 +71,7 @@ class QuickButton: public SimpleButton, public KickerTip::Client {
 public:
     enum { DEFAULT_ICON_DIM = 16 };
     enum { ICON_MARGIN = 1 };
-    QuickButton(const TQString &u, KAction* configAction,
+    QuickButton(const TQString &u, TDEAction* configAction,
                 TQWidget *parent=0, const char *name=0);
     ~QuickButton();
     TQString url() const;
@@ -116,7 +116,7 @@ private:
     bool _highlight, _changeCursorOverItem, _dragEnabled;
     int _iconDim;
     bool m_sticky;
-    KToggleAction *m_stickyAction;
+    TDEToggleAction *m_stickyAction;
     int m_stickyId;
     KPanelApplet::Direction m_popupDirection;
 };
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 87ac35387..15439f9c9 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_oldButtons = 0;
     m_dragButtons = 0;
 
-    m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(),
+    m_configAction = new TDEAction(i18n("Configure Quictdelauncher..."), "configure", TDEShortcut(),
         TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
diff --git a/kicker/applets/launcher/quictdelauncher.h b/kicker/applets/launcher/quictdelauncher.h
index c6fe1d2bb..71bd1c841 100644
--- a/kicker/applets/launcher/quictdelauncher.h
+++ b/kicker/applets/launcher/quictdelauncher.h
@@ -39,7 +39,7 @@ class ConfigDlg;
 class TQPopupMenu;
 class QuickButtonGroup;
 class PopularityStatistics;
-class KAction;
+class TDEAction;
 
 typedef QuickButtonGroup ButtonGroup;
 
@@ -128,7 +128,7 @@ protected:
     bool m_dragAccepted, m_refreshEnabled, m_needsSave, m_needsRefresh;
     std::map<TQString, int> m_appOrdering;
     Prefs* m_settings;
-    KAction *m_configAction;
+    TDEAction *m_configAction;
     ConfigDlg *m_configDialog;
     PopularityStatistics* m_popularity;
     TQImage m_stickyHighlightLayer;
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index b55aae92d..26803ddaa 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
 
 bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (!kapp->authorizeKAction("kicker_rmb"))
+    if (!kapp->authorizeTDEAction("kicker_rmb"))
         return false;     // Process event normally:
 
     if( e->type() == TQEvent::MouseButtonPress )
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index f8a1ac630..b6e1e7995 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -427,7 +427,7 @@ void MediaApplet::mousePressEvent(TQMouseEvent *e)
 {
     if(e->button()==Qt::RightButton)
     {
-        KPopupMenu menu(this);
+        TDEPopupMenu menu(this);
     
         menu.insertTitle(i18n("Media"));
         menu.insertItem(SmallIcon("configure"), i18n("&Configure..."), 1);
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index 0f240fcea..a180cfbd9 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -48,7 +48,7 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
 	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
                 "MediumButton::mOpenTimer")
 {
-    KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+    TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
                                     &mActions, "pasteto");
     a->setShortcut(0);
     a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
@@ -110,7 +110,7 @@ void MediumButton::initPopup()
 	KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items,
 	                                   KURL("media:/"), mActions, 0L,
 	                                   this, kpf, bef);
-	KPopupTitle *title = new KPopupTitle(new_popup);
+	TDEPopupTitle *title = new TDEPopupTitle(new_popup);
 	title->setTitle(mFileItem.text());
 
 	new_popup->insertItem(title, -1, 0);
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 5f6a2b80b..1bc6380c2 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -58,7 +58,7 @@ protected slots:
 	void slotDragOpen();
 
 private:
-	KActionCollection mActions;
+	TDEActionCollection mActions;
 	KFileItem mFileItem;
 	TQTimer mOpenTimer;
 };
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index f53381a10..bd1a21b0d 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -63,7 +63,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent,
 	  mMedia(media)
 {
 	TQVBox *types_page = addVBoxPage( i18n("Medium Types") );
-	mpMediumTypesListView = new KListView(types_page);
+	mpMediumTypesListView = new TDEListView(types_page);
 
 	//mpMediumTypesListView->setFullWidth(true);
 	mpMediumTypesListView->addColumn( i18n("Types to Display") );
@@ -72,7 +72,7 @@ PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent,
 
 
 	TQVBox *media_page = addVBoxPage( i18n("Media") );
-	mpMediaListView = new KListView(media_page);
+	mpMediaListView = new TDEListView(media_page);
 
 	//mpMediaListView->setFullWidth(true);
 	mpMediaListView->addColumn( i18n("Media to Display") );
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index f758d280b..b29f697ae 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -45,8 +45,8 @@ protected slots:
 	void slotDefault();
 
 private:
-	KListView *mpMediumTypesListView;
-	KListView *mpMediaListView;
+	TDEListView *mpMediumTypesListView;
+	TDEListView *mpMediaListView;
 	KFileItemList mMedia;
 };
 
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 8a9f68095..ee3bb175c 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -292,7 +292,7 @@ void Applet::setBackground()
 void Applet::claimSelection()
     {
     assert( selection == NULL );
-    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
+    selection = new TDESelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
 // force taking the selection, but don't kill previous owner
     if( selection->claim( true, false ))
 	{
@@ -327,7 +327,7 @@ void Applet::lostSelection()
     active_menu = NULL;
     if( selection_watcher == NULL )
         {
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
+        selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
         connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
         }
     delete module;
diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h
index 5ba54cd66..0b09334b6 100644
--- a/kicker/applets/menu/menuapplet.h
+++ b/kicker/applets/menu/menuapplet.h
@@ -51,7 +51,7 @@ class MenuEmbed;
  *
  * @description All status change, such as when an window is activated,
  * a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref
- * NETWinInfo. Status changes for X selections are done via KSelectionWatcher.
+ * NETWinInfo. Status changes for X selections are done via TDESelectionWatcher.
  *
  * How it works in broad terms:  KickerMenuApplet gets notified as soon a window
  * changes(a new pops up etc.) and accordingly updates the list @ref menus,
@@ -158,12 +158,12 @@ private:
      */
     MenuEmbed* active_menu;
     
-    KSelectionOwner* selection;
+    TDESelectionOwner* selection;
     
     /**
      * Only the messenger. Dispatches signals to  claimSelection().
      */
-    KSelectionWatcher* selection_watcher;
+    TDESelectionWatcher* selection_watcher;
     
     /**
      * Whether the Desktop menu should be used, when a window
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 9d12279c2..6662d57d4 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -143,7 +143,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
     connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
     connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
 
-    if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+    if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
     {
         m_contextMenu = new TQPopupMenu();
         connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
@@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     if( m_desktopLayoutOwner == NULL )
     { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( tqt_xdisplay());
-        m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
+        m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
             screen, TQT_TQOBJECT(this) );
         if( !m_desktopLayoutOwner->claim( false ))
         {
@@ -717,7 +717,7 @@ void KMiniPager::aboutToShowContextMenu()
                                    .arg(twin()->desktopName(m_rmbDesk)), RenameDesktop);
     m_contextMenu->insertSeparator();
 
-    KPopupMenu* showMenu = new KPopupMenu(m_contextMenu);
+    TDEPopupMenu* showMenu = new TDEPopupMenu(m_contextMenu);
     showMenu->setCheckable(true);
     showMenu->insertTitle(i18n("Pager Layout"));
 
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index 9abe65f34..1f0edc409 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -40,7 +40,7 @@ class TQTimer;
 class TDEProcess;
 class KWinModule;
 class KTextShadowEngine;
-class KSelectionOwner;
+class TDESelectionOwner;
 
 class PagerSettings;
 
@@ -128,7 +128,7 @@ private:
     int desktopLayoutOrientation;
     int desktopLayoutX;
     int desktopLayoutY;
-    KSelectionOwner* m_desktopLayoutOwner;
+    TDESelectionOwner* m_desktopLayoutOwner;
 
     KWinModule *m_twin;
     KTextShadowEngine* m_shadowEngine;
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 835174f92..850e4a519 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -246,8 +246,8 @@ void SystemTrayApplet::preferences()
     m_showClockSettingCB = new TQCheckBox("Show Clock in Tray", settingsGrid);
     m_showClockSettingCB->setChecked(m_showClockInTray);
 
-    //m_iconSelector = new KActionSelector(m_settingsDialog);
-    m_iconSelector = new KActionSelector(settingsGrid);
+    //m_iconSelector = new TDEActionSelector(m_settingsDialog);
+    m_iconSelector = new TDEActionSelector(settingsGrid);
     m_iconSelector->setAvailableLabel(i18n("Hidden icons:"));
     m_iconSelector->setSelectedLabel(i18n("Visible icons:"));
     //m_settingsDialog->setMainWidget(m_iconSelector);
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index 92aab7268..332da2f84 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -44,7 +44,7 @@ class TQTimer;
 class KWinModule;
 class TrayEmbed;
 class KDialogBase;
-class KActionSelector;
+class TDEActionSelector;
 
 class SystemTrayApplet : public KPanelApplet, public DCOPObject
 {
@@ -114,7 +114,7 @@ private:
     TQWidget *m_rightSpacer;
     ClockApplet *m_clockApplet;
     KDialogBase* m_settingsDialog;
-    KActionSelector* m_iconSelector;
+    TDEActionSelector* m_iconSelector;
     TQTimer* m_autoRetractTimer;
     bool m_autoRetract;
     int m_iconSize;
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 1f45e1fb4..fe8ad3200 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -39,7 +39,7 @@ TrashButton::TrashButton(TQWidget *parent)
 	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
-	KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+	TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
 	                               &mActions, "paste");
 	a->setShortcut(0);
 
@@ -93,7 +93,7 @@ void TrashButton::initPopup()
 	KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items,
 	                                   KURL("trash:/"), mActions, 0L,
 	                                   this, kpf, bef);
-	KPopupTitle *title = new KPopupTitle(new_popup);
+	TDEPopupTitle *title = new TDEPopupTitle(new_popup);
 	title->setTitle(i18n("Trash"));
 
 	new_popup->insertItem(title, -1, 0);
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 0ddad290e..15c5d598f 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -53,7 +53,7 @@ protected slots:
 	void slotPaste();
 
 private:
-	KActionCollection mActions;
+	TDEActionCollection mActions;
 	KFileItem mFileItem;
 };
 
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index 9c90caac4..5a9ea355a 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -170,7 +170,7 @@ void DockContainer::popupMenu(TQPoint p)
 {
     int r;
     {
-        KPopupMenu pm(this);
+        TDEPopupMenu pm(this);
         pm.insertItem( i18n("Kill This Applet"), 0);
         pm.insertItem( i18n("Change Command"), 1);
         r = pm.exec(p);
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 6545f57eb..912c9b0d3 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -115,6 +115,6 @@ void KasClockItem::showMenuAt( TQPoint p )
     if ( !bar )
 	return;
 
-    KPopupMenu *menu = bar->contextMenu();
+    TDEPopupMenu *menu = bar->contextMenu();
     menu->exec( p );
 }
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 6fa1f9b2a..f89e210ed 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -125,6 +125,6 @@ void KasLoadItem::showMenuAt( TQPoint p )
     if ( !bar )
 	return;
 
-    KPopupMenu *menu = bar->contextMenu();
+    TDEPopupMenu *menu = bar->contextMenu();
     menu->exec( p );
 }
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 86d688b27..54ed56e4a 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -146,32 +146,32 @@ KasTasker::~KasTasker()
     delete grouper;
 }
 
-KPopupMenu *KasTasker::contextMenu()
+TDEPopupMenu *KasTasker::contextMenu()
 {
     if ( !menu ) {
-	menu = new KPopupMenu;
+	menu = new TDEPopupMenu;
 
-	showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(),
+	showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(),
 						  TQT_TQOBJECT(this), "toggle_show_all_windows" );
 	showAllWindowsAction->setChecked( showAllWindows() );
 	showAllWindowsAction->plug( menu );
 	connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
 	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
 
-	groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(),
+	groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(),
 						TQT_TQOBJECT(this), "toggle_group_windows" );
 	groupWindowsAction->setChecked( groupWindows() );
 	groupWindowsAction->plug( menu );
 	connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
 	connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
 
-	showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
+	showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
 	showClockAction->setChecked( showClock() );
 	showClockAction->plug( menu );
 	connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
 	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
 
-	showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
+	showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
 	showLoadAction->setChecked( showLoad() );
 	showLoadAction->plug( menu );
 	connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
@@ -180,14 +180,14 @@ KPopupMenu *KasTasker::contextMenu()
 	menu->insertSeparator();
 
 	if ( !standalone_ ) {
-	    toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
+	    toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
 	    toggleDetachedAction->setChecked( isDetached() );
 	    toggleDetachedAction->plug( menu );
 	    connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
 	    connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
 	}
 
-	rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(),
+	rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(),
 				       TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
 				       TQT_TQOBJECT(this), "rotate_bar" );
 	rotateBarAction->plug( menu );
@@ -201,7 +201,7 @@ KPopupMenu *KasTasker::contextMenu()
 	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
 
 	// Help menu
-	KPopupMenu *help = new KPopupMenu;
+	TDEPopupMenu *help = new TDEPopupMenu;
 	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
 	menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
 
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 27dc2ff44..93cddd1ce 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -64,9 +64,9 @@
 
 class TDEConfig;
 class KPixmap;
-class KPopupMenu;
-class KAction;
-class KToggleAction;
+class TDEPopupMenu;
+class TDEAction;
+class TDEToggleAction;
 
 class Task;
 class Startup;
@@ -105,7 +105,7 @@ public:
     virtual ~KasTasker();
 
     /** Factory method that returns the default menu for items in the bar. */
-    virtual KPopupMenu *contextMenu();
+    virtual TDEPopupMenu *contextMenu();
 
     virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
 
@@ -246,15 +246,15 @@ protected slots:
     void readConfig( TDEConfig *conf );
 
 private:
-    KPopupMenu *menu;
+    TDEPopupMenu *menu;
     TDEConfig *conf;
     KasGrouper *grouper;
-    KToggleAction *toggleDetachedAction;
-    KToggleAction *showAllWindowsAction;
-    KToggleAction *groupWindowsAction;
-    KToggleAction *showClockAction;
-    KToggleAction *showLoadAction;
-    KAction *rotateBarAction;
+    TDEToggleAction *toggleDetachedAction;
+    TDEToggleAction *showAllWindowsAction;
+    TDEToggleAction *groupWindowsAction;
+    TDEToggleAction *showClockAction;
+    TDEToggleAction *showLoadAction;
+    TDEAction *rotateBarAction;
     bool standalone_;
 
     bool passive_;
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index ae775171f..b986ea54a 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -377,7 +377,7 @@ void KasTaskItem::showPropertiesDialog()
     //
     // Title
     //
-    KPopupTitle *title = new KPopupTitle( dlg, "title" );
+    TDEPopupTitle *title = new TDEPopupTitle( dlg, "title" );
     dlg->setCaption( i18n("Task Properties") );
     title->setText( i18n("Task Properties") );
     title->setIcon( icon() );
@@ -415,7 +415,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
     vb->setMargin( KDialog::marginHint() );
 
     // Create List View
-    KListView *taskprops = new KListView( vb, "props_view" );
+    TDEListView *taskprops = new TDEListView( vb, "props_view" );
     taskprops->setResizeMode( TQListView::LastColumn );
     taskprops->addColumn( i18n("Property"), 0 );
     taskprops->addColumn( i18n("Type"), 0 );
@@ -426,7 +426,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
     for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
 	const TQMetaProperty *p = mo->property(i, recursive);
 
-	(void) new KListViewItem( taskprops,
+	(void) new TDEListViewItem( taskprops,
 				  p->name(), p->type(),
 				  target->property( p->name() ).toString() );
     }
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp
index e267848ef..5dc8190ac 100644
--- a/kicker/kicker/buttons/bookmarksbutton.cpp
+++ b/kicker/kicker/buttons/bookmarksbutton.cpp
@@ -40,8 +40,8 @@ BookmarksButton::BookmarksButton(TQWidget* parent)
       actionCollection(0),
       bookmarkOwner(0)
 {
-    actionCollection = new KActionCollection( this );
-    bookmarkParent = new KPopupMenu(this, "bookmarks");
+    actionCollection = new TDEActionCollection( this );
+    bookmarkParent = new TDEPopupMenu(this, "bookmarks");
     bookmarkOwner = new KBookmarkOwner;
     bookmarkMenu = new KBookmarkMenu(KonqBookmarkManager::self(),
                                      bookmarkOwner,
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index 82c0df75d..bb6d450e1 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "panelbutton.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 
 /**
@@ -49,9 +49,9 @@ protected:
     virtual TQString tileName() { return "WindowList"; }
     virtual void initPopup();
 
-    KPopupMenu*          bookmarkParent;
+    TDEPopupMenu*          bookmarkParent;
     KBookmarkMenu*       bookmarkMenu;
-    KActionCollection*   actionCollection;
+    TDEActionCollection*   actionCollection;
     KBookmarkOwner*      bookmarkOwner;
 };
 
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index de596a052..92be0c00b 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -58,7 +58,7 @@ AppletHandle::AppletHandle(AppletContainer* parent)
     m_dragBar->installEventFilter(this);
     m_layout->addWidget(m_dragBar);
 
-    if (kapp->authorizeKAction("kicker_rmb"))
+    if (kapp->authorizeTDEAction("kicker_rmb"))
     {
         m_menuButton = new AppletHandleButton( this );
         m_menuButton->installEventFilter(this);
@@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
 void AppletHandle::menuButtonPressed()
 {
-    if (!kapp->authorizeKAction("kicker_rmb"))
+    if (!kapp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index d3d7f10ba..969a81847 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -139,7 +139,7 @@ void AppletContainer::configure()
 
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeKAction("kicker_rmb"))
+        !kapp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
@@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved()
 
 void AppletContainer::showAppletMenu()
 {
-    if (!kapp->authorizeKAction("kicker_rmb"))
+    if (!kapp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
@@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable)
     BaseContainer::setImmutable(immutable);
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeKAction("kicker_rmb"))
+        !kapp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 8196127e9..189ab5df5 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -244,7 +244,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 
         case Qt::RightButton:
         {
-            if (!kapp->authorizeKAction("kicker_rmb") ||
+            if (!kapp->authorizeTDEAction("kicker_rmb") ||
                 isImmutable())
             {
                 break;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 381b36d4f..769f8408d 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig()
 
 void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
 {
-    if (!kapp->authorizeKAction("kicker_rmb"))
+    if (!kapp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index c42ffc13a..32a5cdfa5 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
             a = new DesktopButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "WindowListButton")
             a = new WindowListButtonContainer(group, m_opMenu, m_contents);
-        else if ((appletType == "BookmarksButton") && kapp->authorizeKAction("bookmarks"))
+        else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks"))
             a = new BookmarksButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "ServiceButton")
             a = new ServiceButtonContainer(group, m_opMenu, m_contents);
@@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info)
 
     if (buttonType == "BookmarksButton")
     {
-        if (kapp->authorizeKAction("bookmarks"))
+        if (kapp->authorizeTDEAction("bookmarks"))
         {
             return addBookmarksButton();
         }
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 1ef72d2c7..86c5e386e 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
           insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy()));
     }
 
-    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeKAction("menuedit"))
+    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
     {
         if (needSeparator)
         {
@@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
     }
 
     if ((actions & PanelAppletOpMenu::BookmarkEditor) &&
-        kapp->authorizeKAction("edit_bookmarks"))
+        kapp->authorizeTDEAction("edit_bookmarks"))
     {
         if (needSeparator)
         {
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index ee82bc91f..6d0f2b542 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -618,7 +618,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos )
 // --------------------------------------------------------------------------
 
 ItemView::ItemView(TQWidget* parent, const char* name)
-    : KListView(parent, name), m_spacer( 0 ),
+    : TDEListView(parent, name), m_spacer( 0 ),
       m_mouseMoveSelects(true), m_iconSize(32)
 {
     setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -746,7 +746,7 @@ void ItemView::moveItemToIndex(KMenuItem* item, int nIndex)
 
     if (nIndex <= 0) {
           takeItem(item);
-          KListView::insertItem(item);
+          TDEListView::insertItem(item);
     }
     else {
         item->moveItem(itemAtIndex(nIndex));
@@ -909,7 +909,7 @@ void ItemView::slotItemClicked(TQListViewItem* item)
 
 void ItemView::contentsMousePressEvent ( TQMouseEvent * e )
 {
-    KListView::contentsMousePressEvent( e );
+    TDEListView::contentsMousePressEvent( e );
 
     TQPoint vp = contentsToViewport(e->pos());
     KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) );
@@ -936,15 +936,15 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
       return;
     }
 
-    KListView::contentsMouseMoveEvent(e);
+    TDEListView::contentsMouseMoveEvent(e);
 
     if (m_mouseMoveSelects) {
       if(i && i->isEnabled() && !i->isSelected() &&
          // FIXME: This is wrong if you drag over the items.
          (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
-          KListView::setSelected(i, true);
+          TDEListView::setSelected(i, true);
       else if (!i && selectedItem())
-          KListView::setSelected(selectedItem(), false);
+          TDEListView::setSelected(selectedItem(), false);
     }
 
     if ( link_cursor )
@@ -956,14 +956,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
 
 void ItemView::leaveEvent(TQEvent* e)
 {
-    KListView::leaveEvent(e);
+    TDEListView::leaveEvent(e);
 
     clearSelection();
 }
 
 void ItemView::resizeEvent ( TQResizeEvent * e )
 {
-    KListView::resizeEvent( e );
+    TDEListView::resizeEvent( e );
 //    if ( m_lastOne )
 //        int diff = itemRect( m_lastOne ).bottom() - viewport()->height();
 }
@@ -971,7 +971,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e )
 void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
 {
     //kdDebug() << "viewportPaintEvent " << pe->rect() << " " << contentsY () << " " << m_old_contentY << endl;
-    KListView::viewportPaintEvent( pe );
+    TDEListView::viewportPaintEvent( pe );
 
     if ( m_lastOne && m_old_contentY != contentsY() ) {
         m_old_contentY = contentsY();
@@ -981,7 +981,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
 
 void ItemView::clear()
 {
-    KListView::clear();
+    TDEListView::clear();
     m_lastOne = 0;
     m_old_contentY = -1;
     m_back_url = TQString();
@@ -989,7 +989,7 @@ void ItemView::clear()
 
 void ItemView::contentsWheelEvent(TQWheelEvent *e)
 {
-    KListView::contentsWheelEvent(e);
+    TDEListView::contentsWheelEvent(e);
 
     TQPoint vp = contentsToViewport(e->pos());
     TQListViewItem * i = itemAt( vp );
@@ -997,9 +997,9 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
     if(i && i->isEnabled() && !i->isSelected() &&
        // FIXME: This is wrong if you drag over the items.
        (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
-        KListView::setSelected(i, true);
+        TDEListView::setSelected(i, true);
     else if (!i && selectedItem())
-        KListView::setSelected(selectedItem(), false);
+        TDEListView::setSelected(selectedItem(), false);
 }
 
 TQDragObject * ItemView::dragObject()
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index c8b95ee42..995cc57b4 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KickerClientMenu;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 class TQWidgetStack;
@@ -152,7 +152,7 @@ public:
     void setHeight(int);
 };
 
-class ItemView : public KListView
+class ItemView : public TDEListView
 {
     friend class KMenuItem;
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index eb87f02d0..f19d59d8b 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -83,7 +83,7 @@ PanelKMenu::PanelKMenu()
     client_id = 10000;
     // Don't automatically clear the main menu.
     disableAutoClear();
-    actionCollection = new KActionCollection(this);
+    actionCollection = new TDEActionCollection(this);
     setCaption(i18n("TDE Menu"));
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
@@ -263,7 +263,7 @@ void PanelKMenu::initialize()
     // Insert search field
     if (KickerSettings::useSearchBar()) {
         TQHBox* hbox = new TQHBox( this );
-        KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox );
+        TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox );
         searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search..."));
         hbox->setFocusPolicy(TQ_StrongFocus);
         hbox->setFocusProxy(searchEdit);
@@ -295,10 +295,10 @@ void PanelKMenu::initialize()
     bool need_separator = false;
 
     // insert bookmarks
-    if (KickerSettings::useBookmarks() && kapp->authorizeKAction("bookmarks"))
+    if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks"))
     {
         // Need to create a new popup each time, it's deleted by subMenus.clear()
-        KPopupMenu * bookmarkParent = new KPopupMenu( this, "bookmarks" );
+        TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" );
         if(!bookmarkOwner)
             bookmarkOwner = new KBookmarkOwner;
         delete bookmarkMenu; // can't reuse old one, the popup has been deleted
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index 53a29d809..7c76f55ed 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -39,7 +39,7 @@ namespace KPIM {
 
 class KickerClientMenu;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 
@@ -112,7 +112,7 @@ private:
     bool                        delay_init;
     TQIntDict<KickerClientMenu>  clients;
     KBookmarkMenu              *bookmarkMenu;
-    KActionCollection          *actionCollection;
+    TDEActionCollection          *actionCollection;
     KBookmarkOwner             *bookmarkOwner;
     PopupMenuList               dynamicSubMenus;
     KPIM::ClickLineEdit        *searchEdit;
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 464dd87de..a8d69c220 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -176,7 +176,7 @@ KMenu::KMenu()
     // set the first client id to some arbitrarily large value.
     client_id = 10000;
     // Don't automatically clear the main menu.
-    actionCollection = new KActionCollection(this);
+    actionCollection = new TDEActionCollection(this);
 
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
@@ -1825,7 +1825,7 @@ void KMenu::createRecentMenuItems()
 
     m_recentlyView->insertSeparator( nId++, i18n( "Documents" ), -1 );
 
-    TQStringList fileList = KRecentDocument::recentDocuments();
+    TQStringList fileList = TDERecentDocument::recentDocuments();
     kdDebug() << "createRecentMenuItems=" << fileList << endl;
     for (TQStringList::ConstIterator it = fileList.begin();
          it != fileList.end();
@@ -1876,7 +1876,7 @@ void KMenu::clearRecentAppsItems()
 
 void KMenu::clearRecentDocsItems()
 {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
     updateRecent();
 }
 
@@ -2748,7 +2748,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    m_popupMenu = new KPopupMenu(this);
+    m_popupMenu = new TDEPopupMenu(this);
     connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
     bool hasEntries = false;
 
@@ -2801,7 +2801,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                   m_popupMenu->insertItem(SmallIconSet("desktop"),
                       i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2811,7 +2811,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                    m_popupMenu->insertItem(SmallIconSet("kicker"),
                       i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeKAction("menuedit") && !kitem->menuPath().isEmpty())
+            if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
             {
                 hasEntries = true;
                 if (kitem->menuPath().endsWith("/"))
@@ -2841,7 +2841,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
             _items.append( item );
 
             const KURL kurl(uri);
-            KActionCollection act(this);
+            TDEActionCollection act(this);
 
             KonqPopupMenu * konqPopupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items,
                                                    kurl, act, (KNewMenu*)NULL, this,
@@ -2855,7 +2855,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                 }
                 else {
                     delete m_popupMenu;
-                    m_popupMenu = (KPopupMenu*)konqPopupMenu;
+                    m_popupMenu = (TDEPopupMenu*)konqPopupMenu;
                     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title(),-1,0);
                 }
                 hasEntries = true;
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index 8a9970789..344be9b89 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -46,7 +46,7 @@
 class KickerClientMenu;
 class KickoffTabBar;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 class TQWidgetStack;
@@ -210,7 +210,7 @@ private:
     int                         client_id;
     bool                        delay_init;
     TQIntDict<KickerClientMenu>  clients;
-    KActionCollection          *actionCollection;
+    TDEActionCollection          *actionCollection;
     PopupMenuList               dynamicSubMenus;
 
     TQTimer                       m_sloppyTimer;
@@ -290,7 +290,7 @@ private:
     enum KickoffTabEntry { FavoriteTab, ApplicationsTab, ComputerTab,
         HistoryTab, LeaveTab, SearchTab, NumTabs };
 
-    KPopupMenu* m_popupMenu;
+    TDEPopupMenu* m_popupMenu;
     KService* m_popupService;
     PopupPath m_popupPath;
 
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 62cc7ec75..baea6a54b 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -587,7 +587,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
         contextKSycocaEntry_ = entryMap_[id];
 
         delete popupMenu_;
-        popupMenu_ = new KPopupMenu(this);
+        popupMenu_ = new TDEPopupMenu(this);
         connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
         bool hasEntries = false;
 
@@ -600,13 +600,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeKAction("menuedit"))
+            if (kapp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
@@ -627,13 +627,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Menu to Desktop"), AddMenuToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Menu to Main Panel"), AddMenuToPanel);
             }
-            if (kapp->authorizeKAction("menuedit"))
+            if (kapp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index dbc8f496c..89e66937d 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -131,7 +131,7 @@ private slots:
 private:
     enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu,
                             AddItemToDesktop, AddMenuToDesktop, PutIntoRunDialog };
-    KPopupMenu* popupMenu_;
+    TDEPopupMenu* popupMenu_;
     KSycocaEntry* contextKSycocaEntry_;
     void readConfig();
  };
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index d2fb755bb..6cdc1dbac 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -57,7 +57,7 @@ KonsoleMenu::~KonsoleMenu()
     TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole");
 }
 
-static void insertItemSorted(KPopupMenu *menu,
+static void insertItemSorted(TDEPopupMenu *menu,
                              const TQIconSet &iconSet,
                              const TQString &txt, int id)
 {
@@ -196,7 +196,7 @@ void KonsoleMenu::initialize()
     id = 0;
 
     delete m_profileMenu;
-    m_profileMenu = new KPopupMenu(this);
+    m_profileMenu = new TDEPopupMenu(this);
     TQStringList profiles = TDEGlobal::dirs()->findAllResources("data",
                                                            "konsole/profiles/*",
                                                            false, true );
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index e64c53212..4272fbaf9 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -54,8 +54,8 @@ private:
     TQStringList sessionList;
     TQStringList screenList;
     TQValueVector<TQString> m_profiles;
-    KPopupMenu* m_profileMenu;
-    KPopupMenu* m_bookmarksSession;
+    TDEPopupMenu* m_profileMenu;
+    TDEPopupMenu* m_bookmarksSession;
 
     KonsoleBookmarkHandler *m_bookmarkHandlerSession;
 };
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 34bfb9649..314ceae10 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -21,7 +21,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
       m_konsole( konsole ),
       m_importStream( 0L )
 {
-    m_menu = new KPopupMenu( konsole, "bookmark menu" );
+    m_menu = new TDEPopupMenu( konsole, "bookmark menu" );
 
     TQString file = locate( "data", "konsole/bookmarks.xml" );
     if ( file.isEmpty() )
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index 733e52442..a1d2f54de 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -8,7 +8,7 @@
 
 
 class TQTextStream;
-class KPopupMenu;
+class TDEPopupMenu;
 class KonsoleBookmarkMenu;
 class KonsoleMenu;
 
@@ -26,7 +26,7 @@ public:
                                 { emit openURL( url, title ); }
     virtual TQString currentURL() const;
 
-    KPopupMenu *menu() const { return m_menu; }
+    TDEPopupMenu *menu() const { return m_menu; }
 
 signals:
     void openURL( const TQString& url, const TQString& title );
@@ -45,7 +45,7 @@ private:
     void importOldBookmarks( const TQString& path, const TQString& destinationPath );
 
     KonsoleMenu *m_konsole;
-    KPopupMenu *m_menu;
+    TDEPopupMenu *m_menu;
     KonsoleBookmarkMenu *m_bookmarkMenu;
     TQTextStream *m_importStream;
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 1643195e8..3284c7a03 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -21,8 +21,8 @@
 
 
 KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
-                     KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
-                     KActionCollection *collec, bool _isRoot, bool _add,
+                     KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu,
+                     TDEActionCollection *collec, bool _isRoot, bool _add,
                      const TQString & parentAddress )
 : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add,
                  parentAddress),
@@ -47,7 +47,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
  *
  * Why did I do this?
  *   - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus.
- *   - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected()
+ *   - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected()
  *     instead of KonsoleBookmarkMenu::slotBookmarkSelected().
  */
 void KonsoleBookmarkMenu::slotAboutToShow2()
@@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill()
 {
   //kdDebug(1203) << "KBookmarkMenu::refill()" << endl;
   m_lstSubMenus.clear();
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplug( m_parentMenu );
   m_parentMenu->clear();
@@ -90,7 +90,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
     {
       m_parentMenu->insertSeparator();
 
-      KActionMenu * actionMenu = new KActionMenu( i18n("Netscape Bookmarks"),
+      TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Netscape Bookmarks"),
                                                   "netscape",
                                                   m_actionCollection, 0L );
       actionMenu->plug( m_parentMenu );
@@ -127,7 +127,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
       {
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
-        KAction * action = new KAction( text, bm.icon(), 0,
+        TDEAction * action = new TDEAction( text, bm.icon(), 0,
                                         this, TQT_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
@@ -140,7 +140,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
     else
     {
       // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl;
-      KActionMenu * actionMenu = new KActionMenu( text, bm.icon(),
+      TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(),
                                                   m_actionCollection, 0L );
       actionMenu->plug( m_parentMenu );
       m_actions.append( actionMenu );
@@ -162,26 +162,26 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
 
 void KonsoleBookmarkMenu::slotBookmarkSelected()
 {
-    KAction * a;
+    TDEAction * a;
     TQString b;
 
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-    a = (KAction*)sender();
+    a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
-                               ( (KAction *)sender() )->text() /* Title */ );
+                               ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
 void KonsoleBookmarkMenu::slotNSBookmarkSelected()
 {
-    KAction *a;
+    TDEAction *a;
     TQString b;
 
     TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
-    a = (KAction*)sender();
+    a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( link, /*URL */
-                               ( (KAction *)sender() )->text()  /* Title */ );
+                               ( (TDEAction *)sender() )->text()  /* Title */ );
 }
 
 #include "konsolebookmarkmenu.moc"
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index a2325e264..103b6bc19 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -13,12 +13,12 @@
 
 class TQString;
 class KBookmark;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
@@ -27,8 +27,8 @@ class KonsoleBookmarkMenu : public KBookmarkMenu
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
-                         KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
-                         KActionCollection *collec, bool _isRoot,
+                         KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu,
+                         TDEActionCollection *collec, bool _isRoot,
                          bool _add = true, const TQString & parentAddress = "");
 
     void fillBookmarkMenu();
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 3fb0b76d9..95f46dadc 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -41,7 +41,7 @@ K_EXPORT_KICKER_MENUEXT(recentdocs, RecentDocsMenu)
 
 RecentDocsMenu::RecentDocsMenu(TQWidget *parent, const char *name,
                                const TQStringList &/*args*/)
-    : KPanelMenu(KRecentDocument::recentDocumentDirectory(), parent, name)
+    : KPanelMenu(TDERecentDocument::recentDocumentDirectory(), parent, name)
 {
 }
 
@@ -55,7 +55,7 @@ void RecentDocsMenu::initialize() {
 	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
 	insertSeparator();
 
-	_fileList = KRecentDocument::recentDocuments();
+	_fileList = TDERecentDocument::recentDocuments();
 
 	if (_fileList.isEmpty()) {
 		insertItem(i18n("No Entries"), 0);
@@ -90,7 +90,7 @@ void RecentDocsMenu::initialize() {
 }
 
 void RecentDocsMenu::slotClearHistory() {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
     reinitialize();
 }
 
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 100045339..a02d88a6a 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -87,7 +87,7 @@ TQObject* TOMFactory::createObject(TQObject *parent, const char *name, const cha
 class runMenuWidget : public TQWidget, public QMenuItem
 {
     public:
-        runMenuWidget(KPopupMenu* parent, int index)
+        runMenuWidget(TDEPopupMenu* parent, int index)
             : TQWidget (parent),
               m_menu(parent),
               m_index(index)
@@ -164,7 +164,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
         }
 
     private:
-        KPopupMenu* m_menu;
+        TDEPopupMenu* m_menu;
         KHistoryCombo* m_runEdit;
         TQPixmap icon;
         TQRect textRect;
@@ -220,7 +220,7 @@ void TOM::initializeRecentDocs()
                                  this, TQT_SLOT(clearRecentDocHistory()));
     m_recentDocsMenu->insertSeparator();
 
-    m_recentDocURLs = KRecentDocument::recentDocuments();
+    m_recentDocURLs = TDERecentDocument::recentDocuments();
 
     if (m_recentDocURLs.isEmpty())
     {
@@ -267,10 +267,10 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
         return 0;
     }
 
-    KPopupMenu* taskGroup;
+    TDEPopupMenu* taskGroup;
     if( inSubMenu )
     {
-        taskGroup = new KPopupMenu(this);
+        taskGroup = new TDEPopupMenu(this);
 
         if (icon != TQString::null)
         {
@@ -370,8 +370,8 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
 
     if (inSubMenu)
     {
-        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*)),
-                         this, TQT_SLOT(contextualizeRMBmenu(KPopupMenu*, int, TQPopupMenu*)));
+        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
+                         this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
 
         m_submenus.append(taskGroup);
 
@@ -384,7 +384,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
             taskGroup->insertItem("Modify These Tasks", configureMenuID);
             TQPopupMenu* rmbMenu = taskGroup->contextMenu();
             rmbMenu->setFont(m_largerFont);
-            KPopupTitle* title = new KPopupTitle();
+            TDEPopupTitle* title = new TDEPopupTitle();
             title->setText(i18n("%1 Menu Editor").arg(name));
             rmbMenu->insertItem(title, contextMenuTitleID);
             rmbMenu->insertItem(i18n("Add This Task to Panel"));
@@ -492,14 +492,14 @@ void TOM::initialize()
     // RECENTLY USED ITEMS
     insertTitle(i18n("Recently Used Items"), contextMenuTitleID);
 
-    m_recentDocsMenu = new KPopupMenu(this, "recentDocs");
+    m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs");
     m_recentDocsMenu->setFont(m_largerFont);
     connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
     connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
     insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
-    KPopupMenu* recentApps = new KPopupMenu(this, "recentApps");
+    TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps");
     recentApps->setFont(m_largerFont);
     recentApps->setKeyboardShortcutsEnabled(true);
     initializeRecentApps(recentApps);
@@ -573,7 +573,7 @@ void TOM::reload()
     initialize();
 }
 
-void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu)
+void TOM::contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu)
 {
     if (menuItem == configureMenuID)
     {
@@ -588,7 +588,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxM
     {
         text = text.left(parens);
     }
-    KPopupTitle* title = new KPopupTitle();
+    TDEPopupTitle* title = new TDEPopupTitle();
     title->setText(i18n("The \"%2\" Task").arg(text));
     ctxMenu->insertItem(title, contextMenuTitleID, 0);
 }
@@ -608,14 +608,14 @@ void TOM::slotExec(int /* id */)
 void TOM::removeTask()
 {
     // TODO: write this change out to the appropriate config file
-    TQString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem());
+    TQString task = TDEPopupMenu::contextMenuFocus()->text(TDEPopupMenu::contextMenuFocusItem());
     if (KMessageBox::warningContinueCancel(this,
                                   i18n("<qt>Are you sure you want to remove the <strong>%1</strong> task?<p>"
                                         "<em>Tip: You can restore the task after it has been removed by selecting the &quot;Modify These Tasks&quot; entry</em></qt>").arg(task),
                                   i18n("Remove Task?"),KStdGuiItem::del()) == KMessageBox::Continue)
     {
-        m_tasks.remove(KPopupMenu::contextMenuFocusItem());
-        KPopupMenu::contextMenuFocus()->removeItem(KPopupMenu::contextMenuFocusItem());
+        m_tasks.remove(TDEPopupMenu::contextMenuFocusItem());
+        TDEPopupMenu::contextMenuFocus()->removeItem(TDEPopupMenu::contextMenuFocusItem());
     }
 }
 
@@ -833,7 +833,7 @@ void TOM::runTask(int id)
 
 void TOM::clearRecentDocHistory()
 {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
 }
 
 void TOM::openRecentDocument(int id)
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index e4b8cc884..b67f2bd6c 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -24,7 +24,7 @@
 #include <kpanelmenu.h>
 #include <klibloader.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class TQPopupMenu;
 
 typedef TQPtrList<TQPopupMenu> PopupMenuList;
@@ -49,7 +49,7 @@ class TOM : public KPanelMenu
         void slotExec(int);
         //void configChanged();
         void initialize();
-        void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
+        void contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
         //void paletteChanged();
         void clearRecentDocHistory();
         void runCommand();
@@ -91,7 +91,7 @@ class TOM : public KPanelMenu
         bool m_detailedTaskEntries;
         bool m_detailedNamesFirst;
         TaskMap m_tasks;
-        KPopupMenu* m_recentDocsMenu;
+        TDEPopupMenu* m_recentDocsMenu;
         TQStringList m_recentDocURLs;
 };
 
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 9d259176f..dd5cfff4d 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -1212,7 +1212,7 @@ void TaskContainer::popupMenu(int action)
     }
     else if (action == m_settingsObject->ShowOperationsMenu)
     {
-        if (!kapp->authorizeKAction("twin_rmb"))
+        if (!kapp->authorizeTDEAction("twin_rmb"))
         {
             return;
         }