Rename many classes and header files to avoid conflicts with KDE4

25 files changed, 37 insertions, 37 deletions

diff --git a/kivio/kiviopart/KIvioDocIface.cc b/kivio/kiviopart/KIvioDocIface.cc
index 97a2c3c0..b93df9cc 100644
--- a/kivio/kiviopart/KIvioDocIface.cc
+++ b/kivio/kiviopart/KIvioDocIface.cc
@@ -23,7 +23,7 @@
 #include "kivio_map.h"
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "kivio_grid_data.h"
 #include "kivio_config.h"
 
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 2a5cec25..351085a5 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -68,7 +68,7 @@
 
 
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
 #include <kiconloader.h>
 #include <khelpmenu.h>
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index f6f302e3..d19b4650 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -46,12 +46,12 @@
 #include <tdefiledialog.h>
 
 #include <kdialogbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolorbutton.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h
index 2cb6eac3..6571aff1 100644
--- a/kivio/kiviopart/kivio_zoomaction.h
+++ b/kivio/kiviopart/kivio_zoomaction.h
@@ -19,7 +19,7 @@
 #ifndef KIVIO_ZOOMACTION_H
 #define KIVIO_ZOOMACTION_H
 
-#include "tkaction.h"
+#include "ttdeaction.h"
 
 namespace Kivio {
 
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 42239517..eb053c94 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -28,12 +28,12 @@
 #include <tqmenubar.h>
 #include <tqwhatsthis.h>
 
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h
index c27956c2..b13b93bc 100644
--- a/kivio/kiviopart/kivioarrowheadaction.h
+++ b/kivio/kiviopart/kivioarrowheadaction.h
@@ -22,7 +22,7 @@
 #define KIVIOARROWHEADACTION_H
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TDEPopupMenu;
 
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 340d88b8..35a332ce 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -20,12 +20,12 @@
 
 #include "kiviostencilsetaction.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h
index 9544359b..64f64acc 100644
--- a/kivio/kiviopart/kiviostencilsetaction.h
+++ b/kivio/kiviopart/kiviostencilsetaction.h
@@ -22,7 +22,7 @@
 #define KIVIOSTENCILSETACTION_H
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp
index b49baace..38a8af69 100644
--- a/kivio/kiviopart/tools/mousetoolaction.cpp
+++ b/kivio/kiviopart/tools/mousetoolaction.cpp
@@ -18,8 +18,8 @@
  */
 #include "mousetoolaction.h"
 
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
 
 namespace Kivio {
diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h
index f4ba5389..09102fae 100644
--- a/kivio/kiviopart/tools/mousetoolaction.h
+++ b/kivio/kiviopart/tools/mousetoolaction.h
@@ -19,7 +19,7 @@
 #ifndef KIVIOMOUSETOOLACTION_H
 #define KIVIOMOUSETOOLACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <koffice_export.h>
 
 namespace Kivio {
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index acc736ec..78d77d0d 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -9,8 +9,8 @@
 #include "kivio_common.h"
 #include "kivio_factory.h"
 
-#include <ktoolbar.h>
-#include <kaction.h>
+#include <tdetoolbar.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <KoGlobal.h>
 #include <KoZoomHandler.h>
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 2667dffd..ff0eb9ed 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -29,9 +29,9 @@
 #include <tqheader.h>
 #include <tqlayout.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index 4f6bad32..8777bf6e 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -47,7 +47,7 @@
 <customwidgets>
     <customwidget>
         <class>TDEToolBar</class>
-        <header location="local">ktoolbar.h</header>
+        <header location="local">tdetoolbar.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -94,6 +94,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>ktoolbar.h</includehint>
+    <includehint>tdetoolbar.h</includehint>
 </includehints>
 </UI>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp
index 6de8c0ba..7eb9a75c 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp
@@ -28,7 +28,7 @@
 
 #include <tqbitarray.h>
 #include <tqcheckbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index 8372b1a3..0e87398a 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -29,7 +29,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kivio_stencil_spawner_set.h"
 #include "kivio_stencil_spawner.h"
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index b72d886b..c9b5d39b 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -37,7 +37,7 @@
 #include <KoUnitWidgets.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h
index 69a43be8..56ac0490 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.h
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.h
@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 #include <KoPageLayout.h>
 #include <KoUnit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KivioView;
 class TQComboBox;
diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
index 4b84ae30..13204c7e 100644
--- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui
+++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
@@ -160,6 +160,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 92424aaa..76f76c7d 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
 
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 01857617..6c54077e 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqptrlist.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index 5dd3153e..b8a529f7 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -35,8 +35,8 @@
 #include "kivio_layer.h"
 #include "kivio_stencil.h"
 
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <KoZoomHandler.h>
 #include <KoPoint.h>
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index d2f3c4df..4cb43bcc 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <KoPoint.h>
 #include <KoZoomHandler.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 
 #include "kivio_view.h"
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index 768732aa..85814b45 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -248,7 +248,7 @@ You should have received a copy of the GNU General Public License along with thi
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>ktextedit.h</includehint>
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 062e329e..0204132f 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -25,7 +25,7 @@
 
 #include <kiconloader.h>
 #include <ktextedit.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
index 22e9f63c..9cf9b443 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
@@ -23,11 +23,11 @@
 #include "kivio_canvas.h"
 #include "kivio_factory.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
 #include <KoMainWindow.h>
 #include <kdebug.h>
 #include <KoZoomHandler.h>