Rename many classes and header files to avoid conflicts with KDE4

20 files changed, 29 insertions, 29 deletions

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index f02b779c..4ee27476 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -24,8 +24,8 @@
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
-#include <kactioncollection.h>
+#include <tdepopupmenu.h>
+#include <tdeactioncollection.h>
 #include <kdebug.h>
 
 #include <tdetexteditor/view.h>
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 782a2b22..60b4ff69 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -145,6 +145,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index c5b1bbb7..3debb9ba 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
  /** KDE INCLUDES */ 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 /** QT INCLUDES */
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 29a33a56..90824b2d 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -405,9 +405,9 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 7dc7978d..78560f8f 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -27,8 +27,8 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 5e9686ff..005d2261 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -699,7 +699,7 @@
 <includehints>
     <includehint>ktextbrowser.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index f4dc7f38..c37116c5 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index dcd1b393..fe9be401 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -71,7 +71,7 @@
 #include "assistproc.h"
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -83,7 +83,7 @@
 #include <kommanderwidget.h>
 #include <kprocess.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <tdeparts/partmanager.h>
 #include <tdeio/netaccess.h>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 9f4a0ca8..be1d1590 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -58,7 +58,7 @@
 #include "command.h"
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
@@ -67,7 +67,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index e89e04f3..c180c61c 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -19,9 +19,9 @@
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 
 #include <tqclipboard.h>
diff --git a/kommander/editor/pics/Makefile.am b/kommander/editor/pics/Makefile.am
index 2306b047..463e1f05 100644
--- a/kommander/editor/pics/Makefile.am
+++ b/kommander/editor/pics/Makefile.am
@@ -1,5 +1,5 @@
 kmdr_editordir = ${kde_datadir}/kommander/pics
 
-kmdr_editor_DATA = kommandersplash.png toolbox.png kfontcombo.png
+kmdr_editor_DATA = kommandersplash.png toolbox.png tdefontcombo.png
 
 
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index d4a17ea4..bc85f2ff 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -18,8 +18,8 @@
 #include "mainwindow.h"
 #include "pluginmanager.h"
 
-#include <ktoolbar.h>
-#include <klistbox.h>
+#include <tdetoolbar.h>
+#include <tdelistbox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h
index 9f891d2c..b49c4e21 100644
--- a/kommander/pluginmanager/mainwindow.h
+++ b/kommander/pluginmanager/mainwindow.h
@@ -18,7 +18,7 @@
 #ifndef HAVE_MAINWINDOW_H
 #define HAVE_MAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEListBox;
 class PluginManager;
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index f768552d..35ba1c85 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -12,7 +12,7 @@
 #ifndef KmdrMainWindow_H
 #define KmdrMainWindow_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
 	@author Andras Mantia <amantia@tdewebdev.org>
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 739fb0e0..ba5b23ac 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -14,7 +14,7 @@
 #include "kommanderplugin.h"
 #include "specials.h"
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
@@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h
index b970c280..8f8c2a39 100644
--- a/kommander/widgets/listbox.h
+++ b/kommander/widgets/listbox.h
@@ -26,7 +26,7 @@
 
 /* OTHER INCLUDES */
 #include <kommanderwidget.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kommander_export.h>
 class TQWidget;
 
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index aef6821e..721ad120 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -93,7 +93,7 @@ KomStdPlugin::KomStdPlugin()
   addWidget("Table", group, "", 0);
   addWidget("DatePicker", group, "", 0);
   addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
-  addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
   addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
 }
 
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index ba6c3781..1320ce8b 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -17,7 +17,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kommanderplugin.h>
 
 #define INSERTMENUITEM 100
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 7c1c989a..e54077dd 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /* QT INCLUDES */
 #include <tqstring.h>
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index 19cbcea6..173866d6 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -18,7 +18,7 @@
 #define _HAVE_TREEWIDGET_H_
 
 /* KDE INCLUDES */
-#include <klistview.h>
+#include <tdelistview.h>
 
 /* QT INCLUDES */
 #include <tqstring.h>