13 files changed, 19 insertions, 19 deletions
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 1e11eb07..3a9cd15e 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -24,7 +24,7 @@
 #include <KoUnitWidgets.h>
 #include <knuminput.h>
 #include <knumvalidator.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 
 #include <tqcheckbox.h>
@@ -61,7 +61,7 @@ using namespace KSpell2;
 
 #include <float.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index 4a888d39..9e032e81 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -37,12 +37,12 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
 #include <kpixmap.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <tqlayout.h>
 
diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h
index 83acd9c1..a8de6fd3 100644
--- a/kword/KWDocStruct.h
+++ b/kword/KWDocStruct.h
@@ -20,7 +20,7 @@
 #ifndef docstruct_h
 #define docstruct_h
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqwidget.h>
 
 class KWDocument;
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index cdaa15b2..e3f6e98c 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -31,7 +31,7 @@
 #include "KoZoomHandler.h"
 
 #include <klocale.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 #include <tqapplication.h>
 #include <tqpopupmenu.h>
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index db95cf5e..8ef08e91 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -28,11 +28,11 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <kservice.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqfile.h>
 #include <tqvbox.h>
diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index 2ae12b61..972d9a43 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -25,7 +25,7 @@
 #include "KWMailMergeLabelAction.moc"
 #include <KoMainWindow.h>
 #include <kstyle.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class MailMergeDraggableLabel : public TQToolButton
 {
diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h
index 558f69ad..cd104c07 100644
--- a/kword/KWMailMergeLabelAction.h
+++ b/kword/KWMailMergeLabelAction.h
@@ -24,7 +24,7 @@
 #ifndef _MAILMERGE_ACTIONS_
 #define _MAILMERGE_ACTIONS_
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqtoolbutton.h>
 
 class KWMailMergeLabelAction : public TDEAction
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index a9f3e6ac..4df7bc1f 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -55,7 +55,7 @@
 #include <KoStore.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index f32912e0..227f75a5 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -101,7 +101,7 @@
 #include <KoSpeaker.h>
 
 #include <tdeparts/partmanager.h>
-#include <kaccelgen.h>
+#include <tdeaccelgen.h>
 #include <kcolordialog.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -112,7 +112,7 @@
 #include <tdeparts/event.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
diff --git a/kword/KWView.h b/kword/KWView.h
index 957ee5d4..216cc6ea 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -34,7 +34,7 @@
 #include <KoPageLayoutDia.h>
 #include <KoView.h>
 #include <KoPoint.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <KoZoomMode.h>
 
 #include <tqbrush.h>
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index a7fec850..1024ecd0 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -22,7 +22,7 @@
 #define _KWMAILMERGE_KABC_CONFIG_H_
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kabc/stdaddressbook.h>
 
 #include "KWMailMergeKABC.h"
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index 38430e4b..44dc8c8f 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -291,7 +291,7 @@
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index 198e8f2f..f37b6079 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -226,7 +226,7 @@
 </widget>
 <includes>
     <include location="global" impldecl="in declaration">klineedit.h</include>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>