Rename a number of classes to enhance compatibility with KDE4

24 files changed, 53 insertions, 53 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;
 };