Rename many classes and header files to avoid conflicts with KDE4

26 files changed, 45 insertions, 45 deletions

diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index c0c81596..0bcf454b 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -22,13 +22,13 @@
 #include <tqlayout.h>
 #include <tqlistbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kshortcutlist.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdeshortcutlist.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 
 #include "KoCommandHistory.h"
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 2776d409..51ea6539 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -24,7 +24,7 @@
 #include <tqbitmap.h>
 #include <tqdockwindow.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <koffice_export.h>
 class TQPixmap;
 class TQLabel;
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 61200fbe..84f31ee3 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <KoDocument.h>
 #include <KoPoint.h>
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index e3fd77cc..1f1d2f4c 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include "KoInsertLink.h"
 #include <kdesktopfile.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 using namespace KOfficePrivate;
 
diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h
index 7f38617d..e402dd77 100644
--- a/lib/kofficeui/KoPartSelectAction.h
+++ b/lib/kofficeui/KoPartSelectAction.h
@@ -19,7 +19,7 @@
 #ifndef koPartSelectAction_h
 #define koPartSelectAction_h
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <KoQueryTrader.h>
 
 /**
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index eb308452..a5b057bc 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -24,11 +24,11 @@
 #include <tqwhatsthis.h>
 #include <tqmenubar.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.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/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h
index 7c0f5a25..4531e012 100644
--- a/lib/kofficeui/KoSelectAction.h
+++ b/lib/kofficeui/KoSelectAction.h
@@ -19,7 +19,7 @@
 #ifndef KOSELECTACTION_H
 #define KOSELECTACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <koffice_export.h>
 class TDEPopupMenu;
 class TQPoint;
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 1bd11b36..e10fc78c 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -33,7 +33,7 @@
 #include <KoFilterManager.h>
 #include <KoTemplates.h>
 #include <KoDocument.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 1d0fec2a..9b1f213c 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -34,7 +34,7 @@
 
 #include <ktempfile.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <KoTemplates.h>
 #include <kicondialog.h>
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index 12c8b06e..31c0dabf 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -30,12 +30,12 @@
 #include <kdebug.h>
 #include <tdeparts/event.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kseparator.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdeactionclasses.h>
 
 #include <KoMainWindow.h>
 #include "KoToolBox.h"
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 93a82b34..ef7e5a77 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -23,7 +23,7 @@
 #include <tqptrvector.h>
 #include <tqtoolbar.h>
 #include <koffice_export.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TQWidget;
 class TDEAction;
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index ba08e1a1..f44adfb9 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -26,7 +26,7 @@
 #include <tqpopupmenu.h>
 
 #include <kglobalsettings.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <KoTooluButton.h>
 #include <kcolordrag.h>
 #include <klocale.h>
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 31a3d332..b2975123 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -20,7 +20,7 @@
 #ifndef _kotoolbutton_h_
 #define _kotoolbutton_h_
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <tqmap.h>
 #include <tqpoint.h>
 
diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h
index 12e38103..ec3b9fc1 100644
--- a/lib/kofficeui/KoZoomAction.h
+++ b/lib/kofficeui/KoZoomAction.h
@@ -19,7 +19,7 @@
 #ifndef kozoomaction_h
 #define kozoomaction_h
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <koffice_export.h>
 /**
  * Class KoZoomAction implements an action to provide zoom values.
diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp
index c2405045..41fcf794 100644
--- a/lib/kofficeui/Kolinestyleaction.cpp
+++ b/lib/kofficeui/Kolinestyleaction.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqbitmap.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index 84e770cc..1d1525cd 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -27,11 +27,11 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.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/lib/kofficeui/Makefile.am b/lib/kofficeui/Makefile.am
index d274e9ac..cef66f55 100644
--- a/lib/kofficeui/Makefile.am
+++ b/lib/kofficeui/Makefile.am
@@ -16,7 +16,7 @@ libkofficeui_la_SOURCES = \
 	KoKoolBar.cpp KoTemplateCreateDia.cpp KoContextCelp.cpp\
 	kcoloractions.cpp \
 	KoPictureFilePreview.cpp KoUnitWidgets.cpp \
-	tkaction.cpp tkcoloractions.cpp tkcombobox.cpp tktoolbarbutton.cpp \
+	ttdeaction.cpp tkcoloractions.cpp tkcombobox.cpp ttdetoolbarbutton.cpp \
 	KoCharSelectDia.cpp KoInsertLink.cpp KoEditPath.cpp KoCommandHistory.cpp \
 	KoSelectAction.cpp Kolinewidthaction.cpp Kolinestyleaction.cpp \
 	KoTooluButton.cpp \
@@ -35,7 +35,7 @@ include_HEADERS = \
 	KoKoolBar.h KoTemplateCreateDia.h KoContextCelp.h \
 	kcoloractions.h \
 	KoPictureFilePreview.h KoUnitWidgets.h \
-	tkaction.h tkcoloractions.h tktoolbarbutton.h tkcombobox.h \
+	ttdeaction.h tkcoloractions.h ttdetoolbarbutton.h tkcombobox.h \
 	KoCharSelectDia.h KoInsertLink.h KoTooluButton.h KoEditPath.h \
 	KoCommandHistory.h  KoImageResource.h \
 	KoSelectAction.h Kolinewidthaction.h Kolinestyleaction.h \
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 96e48001..2f9a41e2 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -24,8 +24,8 @@
 #include <tqtooltip.h>
 
 #include <kapplication.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
 
 KColorAction::KColorAction( const TQString& text, int accel,
diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h
index db832d8b..8842f480 100644
--- a/lib/kofficeui/kcoloractions.h
+++ b/lib/kofficeui/kcoloractions.h
@@ -20,7 +20,7 @@
 #ifndef kcoloractions_h
 #define kcoloractions_h
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 /**
  * An action whose pixmap is automatically generated from a color.
@@ -94,7 +94,7 @@ signals:
     void colorSelected( const TQColor& color );
 
 private:
-    TQString whatsThisWithIcon() const; // duplicated, as it's private in kaction
+    TQString whatsThisWithIcon() const; // duplicated, as it's private in tdeaction
 
     Type m_type;
     TQColor m_color;
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index d04a31c4..d0b81f62 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -24,7 +24,7 @@
 #include <tqmenubar.h>
 
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <KoTooluButton.h>
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 3e7d6480..eb190613 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -20,11 +20,11 @@
 
 
 #include "tkcoloractions.h"
-#include "tktoolbarbutton.h"
+#include "ttdetoolbarbutton.h"
 
 #include <tqlayout.h>
 #include <kcolordialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h
index 2b5dcd82..eb77fa7a 100644
--- a/lib/kofficeui/tkcoloractions.h
+++ b/lib/kofficeui/tkcoloractions.h
@@ -21,9 +21,9 @@
 #ifndef TKCOLORACTION_H
 #define TKCOLORACTION_H
 
-#include "tkaction.h"
+#include "ttdeaction.h"
 #include <koffice_export.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqdict.h>
 
 class TQGridLayout;
diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp
index 56c626f8..bfdc6c11 100644
--- a/lib/kofficeui/ttdeaction.cpp
+++ b/lib/kofficeui/ttdeaction.cpp
@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include "tkaction.h"
-#include "tktoolbarbutton.h"
+#include "ttdeaction.h"
+#include "ttdetoolbarbutton.h"
 #include "tkcombobox.h"
 
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 
 #define SET_FOR_ALL_CONTAINER(WIDGET_TYPE,METHOD_NAME,VALUE)             \
@@ -297,4 +297,4 @@ void TTDESelectAction::setEditText(const TQString& text)
 }
 
 #undef SET_FOR_ALL_CONTAINER
-#include "tkaction.moc"
+#include "ttdeaction.moc"
diff --git a/lib/kofficeui/ttdeaction.h b/lib/kofficeui/ttdeaction.h
index 736bb141..015bcce9 100644
--- a/lib/kofficeui/ttdeaction.h
+++ b/lib/kofficeui/ttdeaction.h
@@ -20,7 +20,7 @@
 #ifndef TKACTION_H
 #define TKACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqstringlist.h>
 #include <koffice_export.h>
 namespace TK {
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index c4c8e27b..51d82500 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include <tktoolbarbutton.h>
+#include <ttdetoolbarbutton.h>
 
 #include <tqtimer.h>
 #include <tqtooltip.h>
@@ -529,4 +529,4 @@ void TTDEToolBarButton::setIconMode( TK::IconMode m )
   repaint();
 }
 
-#include <tktoolbarbutton.moc>
+#include <ttdetoolbarbutton.moc>
diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h
index 14d3b285..9f5d9540 100644
--- a/lib/kofficeui/ttdetoolbarbutton.h
+++ b/lib/kofficeui/ttdetoolbarbutton.h
@@ -20,7 +20,7 @@
 #ifndef TKTOOLBARBUTTON_H
 #define TKTOOLBARBUTTON_H
 
-#include <tkaction.h>
+#include <ttdeaction.h>
 
 #include <tqpixmap.h>
 #include <tqtoolbutton.h>