Rename many classes and header files to avoid conflicts with KDE4

75 files changed, 109 insertions, 109 deletions

diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc
index 687345e2b..da930dba9 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cc
@@ -37,8 +37,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfontdialog.h>
-#include <klistview.h>
+#include <tdefontdialog.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h
index 8a3dd77de..7a8f0369d 100644
--- a/lib/kformula/kformuladocument.h
+++ b/lib/kformula/kformuladocument.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <KoCommandHistory.h>
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index 58074a2bb..8591eb04a 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kglobalsettings.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 
 #include "symbolaction.h"
diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h
index a7c91292c..8021ed507 100644
--- a/lib/kformula/symbolaction.h
+++ b/lib/kformula/symbolaction.h
@@ -20,7 +20,7 @@
 #ifndef _SYMBOLACTION_H_
 #define _SYMBOLACTION_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqmemarray.h>
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 31cfde386..bd0c5285a 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -32,7 +32,7 @@
 
 #include <kinstance.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
 #include <kurl.h>
diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h
index 596c3c12a..1ae87ce99 100644
--- a/lib/kofficecore/KoDetailsPane.h
+++ b/lib/kofficecore/KoDetailsPane.h
@@ -19,7 +19,7 @@
 #ifndef KODETAILSPANE_H
 #define KODETAILSPANE_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "koDetailsPaneBase.h"
 
diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc
index cfa21a935..e4275d758 100644
--- a/lib/kofficecore/KoDocumentIface.cc
+++ b/lib/kofficecore/KoDocumentIface.cc
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdcopactionproxy.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>
 
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 361cc5cdf..93236c2bb 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -50,7 +50,7 @@
 #include <ktempfile.h>
 #include <kmimetype.h>
 #include <tqlayout.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqgrid.h>
 #include <tqmap.h>
 #include <kfilterdev.h>
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index c2ecb369f..2a894a0ef 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <KoDocument.h>
 #include <klibloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index f013ca368..5a8c0d262 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -46,7 +46,7 @@
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <ktempfile.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/plugin.h>
 #include <tdeparts/event.h>
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 4a2872c6d..6459171a5 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -35,7 +35,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "KoFilterManager.h"
 #include "KoTemplates.h"
diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc
index df6eaa318..b52b9f0a8 100644
--- a/lib/kofficecore/KoViewIface.cc
+++ b/lib/kofficecore/KoViewIface.cc
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdcopactionproxy.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 //static
 TQCString KoViewIface::newIfaceName()
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index eec3c41ec..57cd09e2a 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 
 #include <tqmultilineedit.h>
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 407ebe4a8..212d02605 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -32,8 +32,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 // KKbdAccessExtensions includes
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index a34d3116f..79658b580 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -231,7 +231,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextbrowser.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index 35cd7b2a6..44dbc658d 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -219,7 +219,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index dcc563b1f..b1ec19845 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -138,7 +138,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index c0c81596e..0bcf454b7 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 2776d4096..51ea6539d 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 61200fbea..84f31ee3e 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 e3fd77cce..1f1d2f4cc 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 7f38617de..e402dd771 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 eb308452e..a5b057bc6 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 7c0f5a259..4531e0123 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 1bd11b36f..e10fc78cf 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 1d0fec2a9..9b1f213c2 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 12c8b06e6..31c0dabf1 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 93a82b346..ef7e5a774 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 ba08e1a10..f44adfb96 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 31a3d3324..b29751239 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 12e381032..ec3b9fc1d 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 c24050452..41fcf7948 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 84e770cc6..1d1525cda 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 d274e9ac9..cef66f55c 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 96e480013..2f9a41e2a 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 db832d8b3..8842f480b 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 d04a31c46..d0b81f622 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 3e7d64801..eb1906135 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 2b5dcd826..eb77fa7a6 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 56c626f8c..bfdc6c11b 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 736bb1416..015bcce98 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 c4c8e27bf..51d825003 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 14d3b2855..9f5d95409 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>
diff --git a/lib/kopainter/ko_color_wheel.h b/lib/kopainter/ko_color_wheel.h
index 6e20da026..d57a98dab 100644
--- a/lib/kopainter/ko_color_wheel.h
+++ b/lib/kopainter/ko_color_wheel.h
@@ -21,7 +21,7 @@
 
 #include <tqpixmap.h>
 
-#include <kselect.h>
+#include <tdeselect.h>
 #include <koColor.h>
 
 class TQPainter;
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index 9868dec8f..942215d56 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -20,7 +20,7 @@
 #include "ko_hsv_widget.h"
 #include "ko_color_wheel.h"
 
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index e93cae7c5..2202a86f4 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -32,7 +32,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 
 #include <KoView.h>
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index de35054a1..688e1450f 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -25,9 +25,9 @@
 
 #include <tdeparts/event.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h
index 0fbcf45f5..204bb615c 100644
--- a/lib/koproperty/editor.h
+++ b/lib/koproperty/editor.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include "koproperty_global.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQSize;
 
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index a22bab55d..9ff690359 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstyle.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 
 #define BRANCHBOX_SIZE 9
@@ -89,7 +89,7 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T
 }
 
 //! @internal
-//! Based on TDEPopupTitle, see kpopupmenu.cpp
+//! Based on TDEPopupTitle, see tdepopupmenu.cpp
 class GroupWidgetBase : public TQWidget
 {
 	public:
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index a1300e5a0..d3515073b 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -23,7 +23,7 @@
 #define KPROPERTY_PROPERTYEDITORITEM_H
 
 #include "koproperty_global.h"
-#include <klistview.h>
+#include <tdelistview.h>
 
 #define KPROPEDITOR_ITEM_MARGIN 2
 #define KPROPEDITOR_ITEM_BORDER_COLOR TQColor(200,200,200) //! \todo custom color?
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 84c7c3d27..2de0468b2 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -32,8 +32,8 @@
 #include <tqtooltip.h>
 
 #include <tdeversion.h>
-#include <kfontrequester.h>
-#include <kaccelmanager.h>
+#include <tdefontrequester.h>
+#include <tdeaccelmanager.h>
 #include <klocale.h>
 
 //! @internal
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index f803d4c3b..a01248f2c 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -40,7 +40,7 @@
 
 #ifdef TQ_WS_WIN
 #include <win32_utils.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #endif
 
 #ifndef PURE_QT
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index 77ceb415d..06277aa48 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
diff --git a/lib/koproperty/test/test.h b/lib/koproperty/test/test.h
index 51ee85f53..2866031aa 100644
--- a/lib/koproperty/test/test.h
+++ b/lib/koproperty/test/test.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <koproperty/set.h>
 
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index 3d6153ae4..2028e75cd 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 
 using namespace KoProperty;
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index 4f503d17a..60b74bb00 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
 
 #include <tqlayout.h>
diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h
index 25b826ab4..2d796725d 100644
--- a/lib/kotext/KoCustomVariablesDia.h
+++ b/lib/kotext/KoCustomVariablesDia.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <koffice_export.h>
 class TQComboBox;
 class TQVBox;
diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h
index a3e35b1d3..a0779a84d 100644
--- a/lib/kotext/KoFontDia.h
+++ b/lib/kotext/KoFontDia.h
@@ -20,7 +20,7 @@
 #ifndef __kofontdia_h__
 #define __kofontdia_h__
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tqtabwidget.h>
 #include <KoTextFormat.h>
 #include <tqcheckbox.h>
diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index 7bbca0417..52aba2370 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -29,7 +29,7 @@
 #include <kcolorbutton.h>
 #include <kcommand.h>
 #include <kdebug.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 55c54e9d7..a261d59f4 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kdatatool.h>
@@ -357,7 +357,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ
             }
             // We should use TDEAccel instead, to make this configurable !
             // Well, those are all alternate keys, for keys already configurable (KDE-wide)
-            // and a kaccel makes it hard to
+            // and a tdeaccel makes it hard to
             else
 	    {
                 if ( e->state() & ControlButton ) {
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index 8a066456f..6113b6d67 100644
--- a/lib/kotext/KoVariable.h
+++ b/lib/kotext/KoVariable.h
@@ -26,7 +26,7 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "KoRichText.h"
 #include <tqvariant.h>
 #include <koffice_export.h>
diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp
index 7103821b6..cf41b3b42 100644
--- a/lib/kotext/TDEFontDialog_local.cpp
+++ b/lib/kotext/TDEFontDialog_local.cpp
@@ -48,7 +48,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <tqlineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/lib/kotext/TDEFontDialog_local.h b/lib/kotext/TDEFontDialog_local.h
index 4c2388746..a9001e716 100644
--- a/lib/kotext/TDEFontDialog_local.h
+++ b/lib/kotext/TDEFontDialog_local.h
@@ -1,5 +1,5 @@
 /*
-    $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
+    $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
 
     Requires the TQt widget libraries, available at no cost at
     http://www.troll.no
@@ -52,7 +52,7 @@ class KIntNumInput;
  * TDEFontDialog_local.
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
- * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
+ * @version $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
  */
 class KOTEXT_EXPORT TDEFontChooser_local : public TQWidget
 {
@@ -343,10 +343,10 @@ private:
  *            ...
  * \endcode
  *
- * \image html kfontdialog.png "KDE Font Dialog"
+ * \image html tdefontdialog.png "KDE Font Dialog"
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
- * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
+ * @version $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $
  */
 class KOTEXT_EXPORT TDEFontDialog_local : public KDialogBase  {
     Q_OBJECT
diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
index 6ec0f9443..d09d64135 100755
--- a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
+++ b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic
@@ -1765,7 +1765,7 @@ k2lej
 k2lim
 3klip
 k2lis
-5klist3r
+5tdelist3r
 k5lock.
 5klocka
 3klos
@@ -4374,7 +4374,7 @@ yg4g^^e5
 ygs4p
 y1i
 y1ki
-y5klist
+y5tdelist
 yk5lon
 yk3n
 y1ko
diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp
index 7578eb30f..89a115f6b 100644
--- a/lib/kross/api/eventaction.cpp
+++ b/lib/kross/api/eventaction.cpp
@@ -21,7 +21,7 @@
 #include "variant.h"
 
 //#include <tqobject.h>
-//#include <kaction.h>
+//#include <tdeaction.h>
 
 using namespace Kross::Api;
 
diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h
index 602a697fe..1561957d4 100644
--- a/lib/kross/api/eventaction.h
+++ b/lib/kross/api/eventaction.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 //#include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <ksharedptr.h>
 
 #include "event.h"
diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h
index 06a4836dc..6465a070e 100644
--- a/lib/kross/main/mainmodule.h
+++ b/lib/kross/main/mainmodule.h
@@ -34,7 +34,7 @@
 #include <tqobject.h>
 
 #include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 namespace Kross { namespace Api {
 
diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h
index 4d60d4dcb..ce6544bc6 100644
--- a/lib/kross/main/scriptaction.h
+++ b/lib/kross/main/scriptaction.h
@@ -21,7 +21,7 @@
 #define KROSS_API_SCRIPTACTION_H
 
 #include <tqdom.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "scriptcontainer.h"
 
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 9dd304ae5..ae449a420 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -23,7 +23,7 @@
 #include "wdgscriptsmanager.h"
 
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index de653fbd5..4cbae0814 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -28,12 +28,12 @@
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #if KDE_IS_VERSION(3, 4, 0)
   // The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 116b1ca30..1c9e7247e 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -213,7 +213,7 @@
 <customwidgets>
     <customwidget>
         <class>TDEToolBar</class>
-        <header location="local">ktoolbar.h</header>
+        <header location="local">tdetoolbar.h</header>
         <sizehint>
             <width>20</width>
             <height>100</height>
@@ -235,8 +235,8 @@
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>ktoolbar.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdetoolbar.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/lib/kross/python/cxx/cxx_extensions.cxx b/lib/kross/python/cxx/cxx_extensions.cxx
index f9c942adf..eb9bd4508 100644
--- a/lib/kross/python/cxx/cxx_extensions.cxx
+++ b/lib/kross/python/cxx/cxx_extensions.cxx
@@ -316,7 +316,7 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam
 #if PY_MAJOR_VERSION > 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 1)
 	// first defined in 2.1
 	table->tp_richcompare = 0L;
-	table->tp_weaklistoffset = 0L;
+	table->tp_weatdelistoffset = 0L;
 #else
 	table->tp_xxx7 = 0L;
 	table->tp_xxx8 = 0L;
diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h
index 32e6cdcd7..8e2d355ef 100644
--- a/lib/kross/test/testaction.h
+++ b/lib/kross/test/testaction.h
@@ -26,8 +26,8 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 
 class TestAction : public TQWidget
 {
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index f83d7aceb..4175bc9ee 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -30,7 +30,7 @@
 
 #include <ktextedit.h>
 #include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
 #include <kstandarddirs.h>
 
diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h
index c3da5cc55..45f14de0e 100644
--- a/lib/kross/test/testwindow.h
+++ b/lib/kross/test/testwindow.h
@@ -28,7 +28,7 @@
 //#include <tqobject.h>
 #include <tqstring.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQComboBox;
 class KTextEdit;