Rename a number of classes to enhance compatibility with KDE4

8 files changed, 84 insertions, 84 deletions

diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 82587ac0..a98200ed 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS
 
     m_filetree->readConfig( instance()->config(), "fileselector" );
 
-    m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this);
+    m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this);
 }
 
 FileSelectorPart::~FileSelectorPart()
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index c4cae6e1..f415444d 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -19,7 +19,7 @@ public:
     FileSelectorPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~FileSelectorPart();
 
-    KAction *newFileAction() const { return m_newFileAction; }
+    TDEAction *newFileAction() const { return m_newFileAction; }
 
 public slots:
 //  void showTip();
@@ -34,7 +34,7 @@ private slots:
 
 private:
     TQGuardedPtr<KDevFileSelector> m_filetree;
-    KAction *m_newFileAction;
+    TDEAction *m_newFileAction;
 };
 
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 284b24da..295ff957 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -77,7 +77,7 @@ static void silenceTQToolBar(TQtMsgType, const char *)
 
 
 KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
-        : KToolBar( parent, "KDev FileSelector Toolbar", true )
+        : TDEToolBar( parent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
 }
@@ -87,7 +87,7 @@ KDevFileSelectorToolBar::~KDevFileSelectorToolBar()
 
 void KDevFileSelectorToolBar::setMovingEnabled( bool)
 {
-    KToolBar::setMovingEnabled(false);
+    TDEToolBar::setMovingEnabled(false);
 }
 
 
@@ -121,7 +121,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
         mainwin(mainWindow),
         partController(partController)
 {
-    mActionCollection = new KActionCollection( this );
+    mActionCollection = new TDEActionCollection( this );
 
     TQVBoxLayout* lo = new TQVBoxLayout(this);
 
@@ -145,21 +145,21 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     dir = new KDevDirOperator(m_part, KURL(), this, "operator");
     dir->setView(KFile::/*Simple*/Detail);
 
-    KActionCollection *coll = dir->actionCollection();
+    TDEActionCollection *coll = dir->actionCollection();
     // some shortcuts of diroperator that clashes with KDev
-    coll->action( "delete" )->setShortcut( KShortcut( ALT + Key_Delete ) );
-    coll->action( "reload" )->setShortcut( KShortcut( ALT + Key_F5 ) );
-    coll->action( "back" )->setShortcut( KShortcut( ALT + SHIFT + Key_Left ) );
-    coll->action( "forward" )->setShortcut( KShortcut( ALT + SHIFT + Key_Right ) );
+    coll->action( "delete" )->setShortcut( TDEShortcut( ALT + Key_Delete ) );
+    coll->action( "reload" )->setShortcut( TDEShortcut( ALT + Key_F5 ) );
+    coll->action( "back" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Left ) );
+    coll->action( "forward" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Right ) );
     // some consistency - reset up for dir too
-    coll->action( "up" )->setShortcut( KShortcut( ALT + SHIFT + Key_Up ) );
-    coll->action( "home" )->setShortcut( KShortcut( CTRL + ALT + Key_Home ) );
+    coll->action( "up" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Up ) );
+    coll->action( "home" )->setShortcut( TDEShortcut( CTRL + ALT + Key_Home ) );
 
     lo->addWidget(dir);
     lo->setStretchFactor(dir, 2);
 
     // bookmarks action!
-    KActionMenu *acmBookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark",
+    TDEActionMenu *acmBookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark",
                                 mActionCollection, "bookmarks" );
     acmBookmarks->setDelayed( false );
 
@@ -185,9 +185,9 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
              filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
     // kaction for the dir sync method
-    acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0,
+    acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0,
                              TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
-    toolbar->setIconText( KToolBar::IconOnly );
+    toolbar->setIconText( TDEToolBar::IconOnly );
     toolbar->setIconSize( 16 );
     toolbar->setEnableContextMenu( false );
 
@@ -299,7 +299,7 @@ void KDevFileSelector::setupToolbar( TDEConfig *config )
         "short view" << "detailed view" <<
         "bookmarks" << "sync_dir";
     }
-    KAction *ac;
+    TDEAction *ac;
     for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it )
     {
         if ( *it == "bookmarks" || *it == "sync_dir" )
@@ -586,7 +586,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect
 
     // Toolbar - a lot for a little...
     TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
-    acSel = new KActionSelector( gbToolbar );
+    acSel = new TDEActionSelector( gbToolbar );
     acSel->setAvailableLabel( i18n("A&vailable actions:") );
     acSel->setSelectedLabel( i18n("S&elected actions:") );
     lo->addWidget( gbToolbar );
@@ -758,7 +758,7 @@ void KFSConfigPage::init()
                       "show hidden" << "properties"*/ <<
     "bookmarks" << "sync_dir";
     TQRegExp re("&(?=[^&])");
-    KAction *ac;
+    TDEAction *ac;
     TQListBox *lb;
     for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it )
     {
@@ -798,10 +798,10 @@ void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
     setupMenu();
     updateSelectionDependentActions();
 
-    KActionMenu * am = dynamic_cast<KActionMenu*>(actionCollection()->action("popupMenu"));
+    TDEActionMenu * am = dynamic_cast<TDEActionMenu*>(actionCollection()->action("popupMenu"));
     if (!am)
         return;
-    KPopupMenu *popup = am->popupMenu();
+    TDEPopupMenu *popup = am->popupMenu();
 
     popup->insertSeparator();
     m_part->newFileAction()->plug(popup);
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 7c80a6de..c95335a2 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -32,8 +32,8 @@
 class KDevMainWindow;
 class KDevPartController;
 class FileSelectorPart;
-class KActionCollection;
-class KActionSelector;
+class TDEActionCollection;
+class TDEActionSelector;
 class KDirOperator;
 class KURLComboBox;
 class KHistoryCombo;
@@ -57,7 +57,7 @@ namespace KTextEditor
 */
 
 /* I think this fix for not moving toolbars is better */
-class KDevFileSelectorToolBar: public KToolBar
+class KDevFileSelectorToolBar: public TDEToolBar
 {
     Q_OBJECT
   
@@ -121,7 +121,7 @@ public:
     void setupToolbar( TDEConfig * );
     void setView( KFile::FileView );
     KDevDirOperator *dirOperator(){ return dir; }
-    KActionCollection *actionCollection() { return mActionCollection; };
+    TDEActionCollection *actionCollection() { return mActionCollection; };
 
 public slots:
     void slotFilterChange(const TQString&);
@@ -147,11 +147,11 @@ protected:
 
 private:
     class KDevFileSelectorToolBar *toolbar;
-    KActionCollection *mActionCollection;
+    TDEActionCollection *mActionCollection;
     class KBookmarkHandler *bookmarkHandler;
     KURLComboBox *cmbPath;
     KDevDirOperator * dir;
-    class KAction *acSyncDir;
+    class TDEAction *acSyncDir;
     KHistoryCombo * filter;
     class TQToolButton *btnFilter;
 
@@ -197,7 +197,7 @@ private:
     KDevFileSelector *fileSelector;
     bool bDirty;
     //class TQListBox *lbAvailableActions, *lbUsedActions;
-    KActionSelector *acSel;
+    TDEActionSelector *acSel;
     class TQSpinBox *sbPathHistLength, *sbFilterHistLength;
     class TQCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow;
     class TQCheckBox *cbSesLocation, *cbSesFilter;
diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp
index 3d2a67c3..0b5b3801 100644
--- a/parts/fileselector/kactionselector.cpp
+++ b/parts/fileselector/kactionselector.cpp
@@ -32,24 +32,24 @@
 #include <tqevent.h>
 #include <tqwhatsthis.h>
 
-class KActionSelectorPrivate {
+class TDEActionSelectorPrivate {
   public:
   TQListBox *availableListBox, *selectedListBox;
   TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown;
   TQLabel *lAvailable, *lSelected;
   bool moveOnDoubleClick, keyboardEnabled;
-  KActionSelector::ButtonIconSize iconSize;
+  TDEActionSelector::ButtonIconSize iconSize;
   TQString addIcon, removeIcon, upIcon, downIcon;
-  KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
+  TDEActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
   bool showUpDownButtons;
 };
 
 //BEGIN Constructor/destructor
 
-KActionSelector::KActionSelector( TQWidget *parent, const char *name )
+TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  d = new KActionSelectorPrivate();
+  d = new TDEActionSelectorPrivate();
   d->moveOnDoubleClick = true;
   d->keyboardEnabled = true;
   d->iconSize = SmallIcon;
@@ -115,7 +115,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name )
   d->selectedListBox->installEventFilter( this );
 }
 
-KActionSelector::~KActionSelector()
+TDEActionSelector::~TDEActionSelector()
 {
 		delete d;
 }
@@ -124,17 +124,17 @@ KActionSelector::~KActionSelector()
 
 //BEGIN Public Methods
 
-TQListBox *KActionSelector::availableListBox()
+TQListBox *TDEActionSelector::availableListBox()
 {
   return d->availableListBox;
 }
 
-TQListBox *KActionSelector::selectedListBox()
+TQListBox *TDEActionSelector::selectedListBox()
 {
   return d->selectedListBox;
 }
 
-void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
+void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
 {
   switch ( button )
   {
@@ -155,11 +155,11 @@ void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
     d->btnDown->setIconSet( SmallIconSet( icon, d->iconSize ) );
     break;
     default:
-    kdDebug()<<"KActionSelector::setButtonIcon: DAINBREAD!"<<endl;
+    kdDebug()<<"TDEActionSelector::setButtonIcon: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
+void TDEActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
 {
   switch ( button )
   {
@@ -176,11 +176,11 @@ void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton but
     d->btnDown->setIconSet( iconset );
     break;
     default:
-    kdDebug()<<"KActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
+    kdDebug()<<"TDEActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
+void TDEActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
 {
   switch ( button )
   {
@@ -197,11 +197,11 @@ void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
     d->btnDown->setTextLabel( tip );
     break;
     default:
-    kdDebug()<<"KActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
+    kdDebug()<<"TDEActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
+void TDEActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
 {
   switch ( button )
   {
@@ -218,11 +218,11 @@ void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton butto
     TQWhatsThis::add( d->btnDown, text );
     break;
     default:
-    kdDebug()<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
+    kdDebug()<<"TDEActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonsEnabled()
+void TDEActionSelector::setButtonsEnabled()
 {
   d->btnAdd->setEnabled( d->availableListBox->currentItem() > -1 );
   d->btnRemove->setEnabled( d->selectedListBox->currentItem() > -1 );
@@ -235,84 +235,84 @@ void KActionSelector::setButtonsEnabled()
 
 //BEGIN Properties
 
-bool KActionSelector::moveOnDoubleClick() const
+bool TDEActionSelector::moveOnDoubleClick() const
 {
   return d->moveOnDoubleClick;
 }
 
-void KActionSelector::setMoveOnDoubleClick( bool b )
+void TDEActionSelector::setMoveOnDoubleClick( bool b )
 {
   d->moveOnDoubleClick = b;
 }
 
-bool KActionSelector::keyboardEnabled() const
+bool TDEActionSelector::keyboardEnabled() const
 {
   return d->keyboardEnabled;
 }
 
-void KActionSelector::setKeyboardEnabled( bool b )
+void TDEActionSelector::setKeyboardEnabled( bool b )
 {
   d->keyboardEnabled = b;
 }
 
-TQString KActionSelector::availableLabel() const
+TQString TDEActionSelector::availableLabel() const
 {
   return d->lAvailable->text();
 }
 
-void KActionSelector::setAvailableLabel( const TQString &text )
+void TDEActionSelector::setAvailableLabel( const TQString &text )
 {
   d->lAvailable->setText( text );
 }
 
-TQString KActionSelector::selectedLabel() const
+TQString TDEActionSelector::selectedLabel() const
 {
   return d->lSelected->text();
 }
 
-void KActionSelector::setSelectedLabel( const TQString &text )
+void TDEActionSelector::setSelectedLabel( const TQString &text )
 {
   d->lSelected->setText( text );
 }
 
-KActionSelector::ButtonIconSize KActionSelector::buttonIconSize() const
+TDEActionSelector::ButtonIconSize TDEActionSelector::buttonIconSize() const
 {
   return d->iconSize;
 }
 
-void KActionSelector::setButtonIconSize( ButtonIconSize size )
+void TDEActionSelector::setButtonIconSize( ButtonIconSize size )
 {
   d->iconSize = size;
   // reload icons
   loadIcons();
 }
 
-KActionSelector::InsertionPolicy KActionSelector::availableInsertionPolicy() const
+TDEActionSelector::InsertionPolicy TDEActionSelector::availableInsertionPolicy() const
 {
   return d->availableInsertionPolicy;
 }
 
-void KActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
 {
   d->availableInsertionPolicy = p;
 }
 
-KActionSelector::InsertionPolicy KActionSelector::selectedInsertionPolicy() const
+TDEActionSelector::InsertionPolicy TDEActionSelector::selectedInsertionPolicy() const
 {
   return d->selectedInsertionPolicy;
 }
 
-void KActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
 {
   d->selectedInsertionPolicy = p;
 }
 
-bool KActionSelector::showUpDownButtons() const
+bool TDEActionSelector::showUpDownButtons() const
 {
   return d->showUpDownButtons;
 }
 
-void KActionSelector::setShowUpDownButtons( bool show )
+void TDEActionSelector::setShowUpDownButtons( bool show )
 {
   d->showUpDownButtons = show;
   if ( show )
@@ -331,7 +331,7 @@ void KActionSelector::setShowUpDownButtons( bool show )
 
 //BEGIN Public Slots
 
-void KActionSelector::polish()
+void TDEActionSelector::polish()
 {
   setButtonsEnabled();
 }
@@ -339,7 +339,7 @@ void KActionSelector::polish()
 //END Public Slots
 
 //BEGIN Protected
-void KActionSelector::keyPressEvent( TQKeyEvent *e )
+void TDEActionSelector::keyPressEvent( TQKeyEvent *e )
 {
   if ( ! d->keyboardEnabled ) return;
   if ( (e->state() & TQt::ControlButton) )
@@ -365,7 +365,7 @@ void KActionSelector::keyPressEvent( TQKeyEvent *e )
   }
 }
 
-bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
+bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress )
   {
@@ -412,7 +412,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
 
 //BEGIN Private Slots
 
-void KActionSelector::buttonAddClicked()
+void TDEActionSelector::buttonAddClicked()
 {
   // move all selected items from available to selected listbox
   TQListBoxItem *item = d->availableListBox->firstItem();
@@ -430,7 +430,7 @@ void KActionSelector::buttonAddClicked()
   d->selectedListBox->setFocus();
 }
 
-void KActionSelector::buttonRemoveClicked()
+void TDEActionSelector::buttonRemoveClicked()
 {
   // move all selected items from selected to available listbox
   TQListBoxItem *item = d->selectedListBox->firstItem();
@@ -448,7 +448,7 @@ void KActionSelector::buttonRemoveClicked()
   d->availableListBox->setFocus();
 }
 
-void KActionSelector::buttonUpClicked()
+void TDEActionSelector::buttonUpClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 0 ) return;
@@ -459,7 +459,7 @@ void KActionSelector::buttonUpClicked()
   emit movedUp( item );
 }
 
-void KActionSelector::buttonDownClicked()
+void TDEActionSelector::buttonDownClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 0 ) return;
@@ -470,7 +470,7 @@ void KActionSelector::buttonDownClicked()
   emit movedDown( item );
 }
 
-void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
+void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item )
 {
   if ( d->moveOnDoubleClick )
     moveItem( item );
@@ -480,7 +480,7 @@ void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
 
 //BEGIN Private Methods
 
-void KActionSelector::loadIcons()
+void TDEActionSelector::loadIcons()
 {
   d->btnAdd->setIconSet( SmallIconSet( d->addIcon, d->iconSize ) );
   d->btnRemove->setIconSet( SmallIconSet( d->removeIcon, d->iconSize ) );
@@ -488,7 +488,7 @@ void KActionSelector::loadIcons()
   d->btnDown->setIconSet( SmallIconSet( d->downIcon, d->iconSize ) );
 }
 
-void KActionSelector::moveItem( TQListBoxItem *item )
+void TDEActionSelector::moveItem( TQListBoxItem *item )
 {
   TQListBox *lbFrom = item->listBox();
   TQListBox *lbTo;
@@ -515,7 +515,7 @@ void KActionSelector::moveItem( TQListBoxItem *item )
     emit removed( item );
 }
 
-int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
+int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 {
   int index;
   switch ( policy )
diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h
index b5dd65d3..a1c26394 100644
--- a/parts/fileselector/kactionselector.h
+++ b/parts/fileselector/kactionselector.h
@@ -27,7 +27,7 @@ class TQKeyEvent;
 class TQEvent;
 class TQIconSet;
 
-class KActionSelectorPrivate;
+class TDEActionSelectorPrivate;
 
 /**
     @short A widget for selecting and arranging actions/objects
@@ -73,7 +73,7 @@ class KActionSelectorPrivate;
     @author Anders Lund <anders@alweb.dk>
 */
 
-class KActionSelector : public TQWidget {
+class TDEActionSelector : public TQWidget {
   Q_OBJECT
   
   TQ_ENUMS( ButtonIconSize InsertionPolicy )
@@ -87,8 +87,8 @@ class KActionSelector : public TQWidget {
   TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
 
 public:
-  KActionSelector( TQWidget *parent=0, const char *name=0 );
-  ~KActionSelector();
+  TDEActionSelector( TQWidget *parent=0, const char *name=0 );
+  ~TDEActionSelector();
     
   /**
      @return The TQListBox holding the available actions
@@ -394,7 +394,7 @@ private:
   /**
     Private data storage 
   */
-  KActionSelectorPrivate *d;
+  TDEActionSelectorPrivate *d;
 };
 
 #endif // _KACTION_SELECTOR_H_
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 6467b83f..4c1c0271 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -35,7 +35,7 @@
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* kpopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
@@ -43,7 +43,7 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopup
       m_importStream( 0L )
 {
     if (!m_menu)
-      m_menu = new KPopupMenu( parent, "bookmark menu" );
+      m_menu = new TDEPopupMenu( parent, "bookmark menu" );
 
     TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 42d5df58..38091e0f 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -25,8 +25,8 @@
 #include "fileselector_widget.h"
 
 class TQTextStream;
-class KPopupMenu;
-class KActionMenu;
+class TDEPopupMenu;
+class TDEActionMenu;
 
 class KBookmarkHandler : public TQObject, public KBookmarkOwner
 {
@@ -34,14 +34,14 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( KDevFileSelector *parent, KPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
     virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
     virtual TQString currentURL() const;
 
-    KPopupMenu *menu() const { return m_menu; }
+    TDEPopupMenu *menu() const { return m_menu; }
 
 signals:
     void openURL( const TQString& url );
@@ -59,7 +59,7 @@ protected:
 
 private:
     KDevFileSelector *mParent;
-    KPopupMenu *m_menu;
+    TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
     TQTextStream *m_importStream;