Rename a number of classes to enhance compatibility with KDE4

10 files changed, 45 insertions, 45 deletions

diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 41020bd0..878cd44b 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -29,11 +29,11 @@ ClassToolWidget::~ClassToolWidget()
 {}
 
 
-KPopupMenu *ClassToolWidget::createPopup()
+TDEPopupMenu *ClassToolWidget::createPopup()
 {
-    KPopupMenu *popup = contextItem? contextItem->createPopup() : 0;
+    TDEPopupMenu *popup = contextItem? contextItem->createPopup() : 0;
     if (!popup) {
-        popup = new KPopupMenu(this);
+        popup = new TDEPopupMenu(this);
 	popup->insertTitle(i18n("Class Tool"));
     }
 
diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h
index 07182f4e..526d5696 100644
--- a/parts/classview/classtoolwidget.h
+++ b/parts/classview/classtoolwidget.h
@@ -32,7 +32,7 @@ public:
     void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter);
 
 protected:
-    virtual KPopupMenu *createPopup();
+    virtual TDEPopupMenu *createPopup();
     
 private:
     void addClassAndAttributes(ParsedClass *parsedClass, PIAccess filter, ClassTreeItem **lastItem);
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 6aefc1fa..43604b42 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -31,14 +31,14 @@
 #include "classviewpart.h"
 #include "classtooldlg.h"
 
-KPopupMenu *ClassTreeItem::createPopup()
+TDEPopupMenu *ClassTreeItem::createPopup()
 {
     if (!m_item || m_item->itemType() == PIT_SCOPE)
         return 0;
 
     KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
 
-    KPopupMenu *popup = new KPopupMenu();
+    TDEPopupMenu *popup = new TDEPopupMenu();
     if (features & KDevLanguageSupport::Declarations)
         popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
@@ -448,7 +448,7 @@ void ClassToolTip::maybeTip(const TQPoint &p)
 
 
 ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
     setFocusPolicy(ClickFocus);
     setRootIsDecorated(true);
@@ -572,7 +572,7 @@ void ClassTreeBase::slotContextMenuRequested(TQListViewItem *item, const TQPoint
 {
     contextItem = static_cast<ClassTreeItem*>(item);
     
-    KPopupMenu *popup = createPopup();
+    TDEPopupMenu *popup = createPopup();
     popup->exec(p);
     delete popup;
 }
diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h
index 25ef4f91..fb218387 100644
--- a/parts/classview/classtreebase.h
+++ b/parts/classview/classtreebase.h
@@ -24,10 +24,10 @@
 #include "parsedscript.h"
 
 class ClassTreeItem;
-class KPopupMenu;
+class TDEPopupMenu;
 
 
-class ClassTreeBase : public KListView
+class ClassTreeBase : public TDEListView
 {
     Q_OBJECT
   
@@ -43,7 +43,7 @@ protected:
     void setTreeState(TreeState state);
     
     ClassTreeItem *contextItem;
-    virtual KPopupMenu *createPopup() = 0;
+    virtual TDEPopupMenu *createPopup() = 0;
     
 private slots:
     void slotItemExecuted(TQListViewItem*);
@@ -98,7 +98,7 @@ public:
     // m_item has been deleted.
     void notify() { m_item = 0; }
 
-    KPopupMenu *createPopup();
+    TDEPopupMenu *createPopup();
     bool isOrganizer() { return !m_item; }
     void init() 
     { 
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index a30f6158..7bf70310 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -195,7 +195,7 @@ void ClassViewPart::slotProjectClosed( )
 
 void ClassViewPart::setupActions( )
 {
-    m_functionsnav = new KListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true );
+    m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true );
     connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*)));
 //    m_functionsnav->view()->setEditable(false);
     connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused()));
@@ -205,11 +205,11 @@ void ClassViewPart::setupActions( )
 //    m_functionsnav->view()->setCurrentText(NAV_NODEFINITION);
     m_functionsnav->view()->setDefaultText(NAV_NODEFINITION);
 
-    new KAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
+    new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
     if (langHasFeature(KDevLanguageSupport::Classes))
     {
-        KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
+        TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
         ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. "
                                  "Note, it does not display classes outside inheritance hierarchy."));    
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 18ecdad4..271830ba 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -46,9 +46,9 @@ namespace KTextEditor
 
 
 class ClassViewWidget;
-class KListViewAction;
+class TDEListViewAction;
 class TQListViewItem;
-class KToolBarPopupAction;
+class TDEToolBarPopupAction;
 class NamespaceItem;
 class Navigator;
 class HierarchyDialog;
@@ -62,7 +62,7 @@ public:
 
     bool langHasFeature(KDevLanguageSupport::Features feature);
     
-    KListViewAction *m_functionsnav;
+    TDEListViewAction *m_functionsnav;
     Navigator *navigator;
 
     inline ClassViewWidget* widget() {
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 6fdf32ae..9142d110 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -49,7 +49,7 @@
 // namespace ?!?
 
 ClassViewWidget::ClassViewWidget( ClassViewPart * part )
-    : KListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 )
+    : TDEListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 )
 {
     addColumn( "" );
     header()->hide();
@@ -67,32 +67,32 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
 
     TQStringList lst;
     lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" );
-    m_actionViewMode = new KSelectAction( i18n("View Mode"), KShortcut(), m_part->actionCollection(), "classview_mode" );
+    m_actionViewMode = new TDESelectAction( i18n("View Mode"), TDEShortcut(), m_part->actionCollection(), "classview_mode" );
     m_actionViewMode->setItems( lst );
     m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view."));
 
-    m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()),
+    m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()),
 				    m_part->actionCollection(), "classview_new_class" );
     m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard."));
 	
-	m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
+	m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
 	
 	
-    m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()),
+    m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()),
 				    m_part->actionCollection(), "classview_add_method" );
     m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard."));
-    m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()),
+    m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()),
 				    m_part->actionCollection(), "classview_add_attribute" );
     m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."));
 
-    m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()),
+    m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()),
 				    m_part->actionCollection(), "classview_open_declaration" );
     m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line."));
-    m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()),
+    m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()),
 				    m_part->actionCollection(), "classview_open_implementation" );
     m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line."));
 
-	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
+	m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
     TDEConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
@@ -138,7 +138,7 @@ void ClassViewWidget::slotExecuted( TQListViewItem* item )
 
 void ClassViewWidget::clear( )
 {
-    KListView::clear();
+    TDEListView::clear();
     removedText.clear();
     m_projectItem = 0;
 }
@@ -315,7 +315,7 @@ void ClassViewWidget::removeFile( const TQString& fileName )
 
 void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev )
 {
-    KPopupMenu menu( this );
+    TDEPopupMenu menu( this );
 
     ClassViewItem* item = dynamic_cast<ClassViewItem*>( selectedItem() );
 
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index e3113035..586ac41e 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -40,10 +40,10 @@ class ClassDomBrowserItem;
 class TypeAliasDomBrowserItem;
 class FunctionDomBrowserItem;
 class VariableDomBrowserItem;
-class KSelectAction;
-class KToggleAction;
+class TDESelectAction;
+class TDEToggleAction;
 
-class ClassViewWidget : public KListView, public TQToolTip
+class ClassViewWidget : public TDEListView, public TQToolTip
 {
     Q_OBJECT
   
@@ -98,14 +98,14 @@ private:
     TQString m_projectDirectory;
     int m_projectDirectoryLength;
     FolderBrowserItem* m_projectItem;
-    KSelectAction* m_actionViewMode;
-    KAction* m_actionNewClass;
-    KAction* m_actionAddMethod;
-    KAction* m_actionAddAttribute;
-    KAction* m_actionOpenDeclaration;
-    KAction* m_actionOpenImplementation;
-	KAction* m_actionCreateAccessMethods;
-    KToggleAction * m_actionFollowEditor;
+    TDESelectAction* m_actionViewMode;
+    TDEAction* m_actionNewClass;
+    TDEAction* m_actionAddMethod;
+    TDEAction* m_actionAddAttribute;
+    TDEAction* m_actionOpenDeclaration;
+    TDEAction* m_actionOpenImplementation;
+	TDEAction* m_actionCreateAccessMethods;
+    TDEToggleAction * m_actionFollowEditor;
     bool m_doFollowEditor;
     friend class ClassViewItem;
     friend class FolderBrowserItem;
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index f5959d73..b79847d1 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -110,14 +110,14 @@ Navigator::Navigator(ClassViewPart *parent, const char *name)
     m_state = GoToDefinitions;
     m_navNoDefinition = true;
 
-    m_actionSyncWithEditor = new KAction( i18n("Sync ClassView"), "view_tree", KShortcut(), this,
+    m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this,
         TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" );
 
-    KAction * action = new KAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this,
+    TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this,
         TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" );
     action->plug( &m_dummyActionWidget );
 
-    action = new KAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this,
+    action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this,
         TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" );
     action->plug( &m_dummyActionWidget );
 
diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h
index 6444f8a6..ed0c3ffb 100644
--- a/parts/classview/navigator.h
+++ b/parts/classview/navigator.h
@@ -29,7 +29,7 @@ class TextPaintStyleStore;
 class TQTimer;
 class ClassViewPart;
 class TQListViewItem;
-class KAction;
+class TDEAction;
 
 #define NAV_NODEFINITION "(no function)"
 
@@ -79,7 +79,7 @@ private:
     NavigationState m_state;
 
     TQWidget m_dummyActionWidget;
-    KAction* m_actionSyncWithEditor;
+    TDEAction* m_actionSyncWithEditor;
 
     bool m_navNoDefinition;