Rename a number of classes to enhance compatibility with KDE4

6 files changed, 22 insertions, 22 deletions

diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index ce5cbb4..e6d19e3 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES    = $(all_includes)
 
 # Needed to catch DOM exceptions
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-# -DKListView=DOMListView
+# -DTDEListView=DOMListView
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = libdomtreeviewerplugin.la
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 250bc77..b8636c9 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -154,7 +154,7 @@ class DOMTreeView : public DOMTreeViewBase
 	TDEHTMLPart *part;
 	TQTextStream* m_textStream;
 
-	const KListView* m_rootListView;
+	const TDEListView* m_rootListView;
 
 	KPushButton* m_saveButton;
 	TQObject *focused_child;
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 4b79c2d..fb0a39e 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -141,7 +141,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>DOM Tree</string>
@@ -326,7 +326,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="KListView">
+                                    <widget class="TDEListView">
                                         <column>
                                             <property name="text">
                                                 <string>Name</string>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 03e3581..4eb5dce 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -56,7 +56,7 @@
 using domtreeviewer::ManipulationCommand;
 
 DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
-    : KMainWindow( 0, "DOMTreeWindow" ),
+    : TDEMainWindow( 0, "DOMTreeWindow" ),
       m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false))
 {
     part_manager = 0;
@@ -67,7 +67,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
     // accept dnd
     setAcceptDrops(true);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     // message window dialog
@@ -132,22 +132,22 @@ void DOMTreeWindow::setupActions()
     KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
 
     // toggle manipulation dialog
-    KAction *showMsgDlg = new KAction(i18n("Show Message Log"),
+    TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"),
     			CTRL+Key_E, actionCollection(), "show_msg_dlg");
     connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog()));
 
-//     KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0,
+//     TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
 //                                   this, TQT_SLOT(optionsPreferences()),
 //                                   actionCollection(), "custom_action");
 
     // actions for the dom tree list view toolbar
     KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
-    KAction *tree_inc_level = new KAction(i18n("Expand"),
+    TDEAction *tree_inc_level = new TDEAction(i18n("Expand"),
 			"1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
 			TQT_SLOT(increaseExpansionDepth()), actionCollection(),
 			"tree_inc_level");
     tree_inc_level->setToolTip(i18n("Increase expansion level"));
-    KAction *tree_dec_level = new KAction(i18n("Collapse"),
+    TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"),
 			"1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()),
 			TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
 			"tree_dec_level");
@@ -155,20 +155,20 @@ void DOMTreeWindow::setupActions()
 
     // actions for the dom tree list view context menu
 
-    del_tree = new KAction(i18n("&Delete"), "editdelete",
+    del_tree = new TDEAction(i18n("&Delete"), "editdelete",
     			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
 			actionCollection(), "tree_delete");
     del_tree->setToolTip(i18n("Delete nodes"));
-    /*KAction *new_elem = */new KAction(i18n("New &Element ..."),
-			"bookmark", KShortcut(), TQT_TQOBJECT(view()),
+    /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."),
+			"bookmark", TDEShortcut(), TQT_TQOBJECT(view()),
 			TQT_SLOT(slotAddElementDlg()), actionCollection(),
 			"tree_add_element");
-    /*KAction *new_text = */new KAction(i18n("New &Text Node ..."),
-			"text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
+    /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."),
+			"text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
 			actionCollection(), "tree_add_text");
 
     // actions for the info panel attribute list context menu
-    del_attr = new KAction(i18n("&Delete"), "editdelete",
+    del_attr = new TDEAction(i18n("&Delete"), "editdelete",
     			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
 			actionCollection(), "attr_delete");
     del_attr->setToolTip(i18n("Delete attributes"));
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index 9681df2..b2b0042 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -41,7 +41,7 @@ namespace KParts {
 class DOMTreeView;
 class PluginDomtreeviewer;
 
-class KAction;
+class TDEAction;
 class TDEConfig;
 class KPrinter;
 class KURL;
@@ -58,7 +58,7 @@ class TQPopupMenu;
  * @short Main window class
  * @author Leo Savernik
  */
-class DOMTreeWindow : public KMainWindow
+class DOMTreeWindow : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -116,9 +116,9 @@ public:
     TDEConfig *config() const { return _config; }
 
     /** returns the attribute delete action */
-    KAction *deleteAttributeAction() const { return del_attr; }
+    TDEAction *deleteAttributeAction() const { return del_attr; }
     /** returns the node delete action */
-    KAction *deleteNodeAction() const { return del_tree; }
+    TDEAction *deleteNodeAction() const { return del_tree; }
 
 public slots:
     /**
@@ -187,7 +187,7 @@ private:
     TQPopupMenu *domtree_ctx;
     TDEConfig *_config;
 
-    KAction *del_tree, *del_attr;
+    TDEAction *del_tree, *del_attr;
 
     TQGuardedPtr<KParts::PartManager> part_manager;
 };
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index 1993526..a83bd1d 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -19,7 +19,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
 	                                  const TQStringList & )
   : Plugin( parent, name ), m_dialog( 0 )
 {
-  (void) new KAction( i18n("Show &DOM Tree"),
+  (void) new TDEAction( i18n("Show &DOM Tree"),
                       "domtreeviewer", 0,
                       this, TQT_SLOT(slotShowDOMTree()),
                       actionCollection(), "viewdomtree" );