Rename a number of classes to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

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);