Rename a number of classes to enhance compatibility with KDE4

6 files changed, 21 insertions, 21 deletions

diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index a7803320..3ac386e5 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -62,7 +62,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     label = new TQLabel(i18n("dictionary to use","Use:"),this);
     layout->addWidget(label,0,2);
 
-    unselectedBox = new KListBox(this,"unselectedBox");
+    unselectedBox = new TDEListBox(this,"unselectedBox");
     layout->addWidget(unselectedBox,1,0);
 
 
@@ -76,7 +76,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     bLayout->addStretch();
     layout->addLayout(bLayout,1,1);
 
-    selectedBox = new KListBox(this,"selectedBox");
+    selectedBox = new TDEListBox(this,"selectedBox");
     layout->addWidget(selectedBox,1,2);
 
 
diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h
index b2f80240..37cc0e28 100644
--- a/kbabel/kbabeldict/dictchooser.h
+++ b/kbabel/kbabeldict/dictchooser.h
@@ -40,7 +40,7 @@
 #include <tqwidget.h>
 #include <kbabeldictbox.h>
 
-class KListBox;
+class TDEListBox;
 class KTempFile;
 
 class TQPushButton;
@@ -80,8 +80,8 @@ private:
     KBabelDictBox* box;
     TQPtrList<ModuleInfo> dictList;
 
-    KListBox *selectedBox;
-    KListBox *unselectedBox;
+    TDEListBox *selectedBox;
+    TDEListBox *unselectedBox;
     
     TQPushButton *selectBtn;
     TQPushButton *unselectBtn;
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index 759468c9..57b7d9d7 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -38,7 +38,7 @@
 
 #include <tqsignalmapper.h>
 
-DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection
+DictionaryMenu::DictionaryMenu(TDEPopupMenu *popupMenu, TDEActionCollection *collection
         , TQObject *parent)
               : TQObject(parent, "dictionarymenu")
               , popup(popupMenu)
@@ -89,7 +89,7 @@ void DictionaryMenu::add(const TQString& name, const TQString& moduleId)
 {
    if(popup)
    {
-      KAction* dictionaryAction = new KAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() );
+      TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() );
       
       uint id = maxId++;
       dictionaryAction->plug(popup, id);
@@ -114,9 +114,9 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId
         {
             keyString=key.arg(accel2id.count()+1);
     	}
-        KShortcut k(keyString);
+        TDEShortcut k(keyString);
 
-    	KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
+    	TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
 	uint id = maxId++;
         dictionaryAction->plug(popup,id);
 
diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h
index 913ef79a..26729c7e 100644
--- a/kbabel/kbabeldict/dictionarymenu.h
+++ b/kbabel/kbabeldict/dictionarymenu.h
@@ -40,8 +40,8 @@
 #include <kdemacros.h>
 
 class TQSignalMapper;
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
 
 class KDE_EXPORT DictionaryMenu : public TQObject
 {
@@ -49,7 +49,7 @@ class KDE_EXPORT DictionaryMenu : public TQObject
   
 
 public:
-   DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0);
+   DictionaryMenu(TDEPopupMenu *menu, TDEActionCollection *collection, TQObject *parent=0);
    ~DictionaryMenu();
    
    void add(const TQString& name,const TQString& id);
@@ -69,8 +69,8 @@ private slots:
    void activated(int);
    
 private:
-   TQGuardedPtr<KPopupMenu> popup;
-   TQGuardedPtr<KActionCollection> actionCollection;
+   TQGuardedPtr<TDEPopupMenu> popup;
+   TQGuardedPtr<TDEActionCollection> actionCollection;
    TQIntDict<TQString> num2id;
    TQIntDict<TQString> accel2id;
    TQSignalMapper* dictionaryMapper;
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index b56f38e3..d62cb176 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -282,7 +282,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
    vbox->addWidget(translationView);
    viewContainer->setMinimumSize(1,1);
    
-   resultListView = new KListView( resultSplitter, "resultListView" );
+   resultListView = new TDEListView( resultSplitter, "resultListView" );
    resultListView->setMinimumSize(1,1);
    resultListView->addColumn( i18n( "Score" ) );
    resultListView->addColumn( i18n( "Original" ) );
@@ -296,9 +296,9 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
    connect(resultListView, TQT_SIGNAL(returnPressed(TQListViewItem *))
            , this, TQT_SLOT(editFile()));
    connect(resultListView
-           , TQT_SIGNAL(contextMenu(KListView *,TQListViewItem *,const TQPoint&))
+           , TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&))
            , this
-           , TQT_SLOT(showContextMenu(KListView *,TQListViewItem *,const TQPoint&)));
+           , TQT_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&)));
    
    resultSplitter->setResizeMode(viewContainer,TQSplitter::KeepSize);
    TQValueList<int> sizes;
@@ -1717,7 +1717,7 @@ void KBabelDictBox::editFile()
    }
 }
 
-void KBabelDictBox::showContextMenu(KListView *,TQListViewItem *,const TQPoint& p)
+void KBabelDictBox::showContextMenu(TDEListView *,TQListViewItem *,const TQPoint& p)
 {
     if(rmbPopup)
     {
diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h
index 5f6fc885..7a71eb06 100644
--- a/kbabel/kbabeldict/kbabeldictbox.h
+++ b/kbabel/kbabeldict/kbabeldictbox.h
@@ -42,7 +42,7 @@
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 
-class KListView;
+class TDEListView;
 class TQLabel;
 class TQListViewItem;
 class TQPopupMenu;
@@ -223,7 +223,7 @@ protected slots:
    void showListOnly();
    void clearModuleResults();
    void editFile();
-   void showContextMenu(KListView *, TQListViewItem *, const TQPoint&);
+   void showContextMenu(TDEListView *, TQListViewItem *, const TQPoint&);
 
    /**
     * This slots gets connected to a SearchEngine's searchStopped() signal,
@@ -270,7 +270,7 @@ private:
    TQTextView *origView;
    TQTextView *translationView;
    TQSplitter *viewContainer;
-   KListView *resultListView;
+   TDEListView *resultListView;
    TQSplitter *resultSplitter;
 
    TQToolButton *listButton;