From ccbad20c6d5a2da13adaf0a3e5e591d3aecd967b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:16:01 -0600
Subject: [PATCH] Rename common header files for consistency with class
 renaming

---
 dcopjava/tests/main.cpp                            |  2 +-
 dcoppython/test/dcopserver/main.cpp                |  6 +++---
 kdejava/koala/kdejava/KDE.cpp                      |  2 +-
 kdejava/koala/kdejava/KDESupport.h                 |  2 +-
 kdejava/koala/kdejava/KSessionManaged.cpp          |  2 +-
 kdejava/koala/kdejava/TDEAboutApplication.cpp      |  2 +-
 kdejava/koala/kdejava/TDEAboutContainer.cpp        |  2 +-
 kdejava/koala/kdejava/TDEAboutContributor.cpp      |  2 +-
 kdejava/koala/kdejava/TDEAboutData.cpp             |  2 +-
 kdejava/koala/kdejava/TDEAboutDialog.cpp           |  2 +-
 kdejava/koala/kdejava/TDEAboutKDE.cpp              |  2 +-
 kdejava/koala/kdejava/TDEAboutPerson.cpp           |  2 +-
 kdejava/koala/kdejava/TDEAboutTranslator.cpp       |  2 +-
 kdejava/koala/kdejava/TDEAboutWidget.cpp           |  2 +-
 kdejava/koala/kdejava/TDEApplication.cpp           |  2 +-
 kdejava/koala/kdejava/TDECmdLineArgs.cpp           |  2 +-
 .../koala/org/kde/koala/KUniqueApplication.java    |  2 +-
 kjsembed/bindings/dcop_imp.cpp                     |  2 +-
 kjsembed/bindings/tdeconfig_imp.cpp                |  2 +-
 kjsembed/cpptests/jsaccess/jsaccess.cpp            |  6 +++---
 kjsembed/docs/embedding/simple-embed/main.cpp      |  6 +++---
 kjsembed/jsfactory.cpp                             |  2 +-
 kjsembed/kjscmd.cpp                                |  6 +++---
 kjsembed/plugin/jsconsoleplugin.cpp                |  2 +-
 kjsembed/tdescript/javascript.cpp                  |  2 +-
 kjsembed/testkjsembed.cpp                          |  6 +++---
 kjsembed/tests/testkjsembed.cpp                    |  6 +++---
 korundum/rubylib/examples/rbTDEHTMLPart.rb         |  2 +-
 korundum/rubylib/korundum/Korundum.cpp             |  2 +-
 korundum/rubylib/korundum/kdehandlers.cpp          |  4 ++--
 .../rbtdeconfig_compiler/rbtdeconfig_compiler.cpp  |  6 +++---
 smoke/kde/kde_header_list                          | 14 +++++++-------
 xparts/mozilla/kmozillapart.cpp                    |  4 ++--
 xparts/mozilla/kshell.cpp                          |  2 +-
 xparts/src/kde/xparthost_kpart.cpp                 |  2 +-
 xparts/xpart_notepad/shell_xparthost.cpp           |  2 +-
 xparts/xpart_notepad/xp_notepad.cpp                |  2 +-
 xparts/xpart_notepad/xp_notepad_factory.cpp        |  2 +-
 38 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/dcopjava/tests/main.cpp b/dcopjava/tests/main.cpp
index 84fad559..c89cda1c 100644
--- a/dcopjava/tests/main.cpp
+++ b/dcopjava/tests/main.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 
diff --git a/dcoppython/test/dcopserver/main.cpp b/dcoppython/test/dcopserver/main.cpp
index aad9030c..1a99f280 100644
--- a/dcoppython/test/dcopserver/main.cpp
+++ b/dcoppython/test/dcopserver/main.cpp
@@ -3,9 +3,9 @@
  */
 
 #include "kdedcoptest.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char *description =
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index c91752ca..7a4da366 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -15,7 +15,7 @@
 #include <tqpixmap.h>
 #include <ksslcertdlg.h>
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdata.h>
 #include <tqiconset.h>
 #include <tdeversion.h>
diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h
index 6df03995..d4883779 100644
--- a/kdejava/koala/kdejava/KDESupport.h
+++ b/kdejava/koala/kdejava/KDESupport.h
@@ -26,7 +26,7 @@
 #include <tdefile.h>
 #include <tdefileview.h>
 #include <kurl.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dom/dom_string.h>
 #include <dom/dom_node.h>
 #include <dom/css_stylesheet.h>
diff --git a/kdejava/koala/kdejava/KSessionManaged.cpp b/kdejava/koala/kdejava/KSessionManaged.cpp
index dcf61bd1..dc30b964 100644
--- a/kdejava/koala/kdejava/KSessionManaged.cpp
+++ b/kdejava/koala/kdejava/KSessionManaged.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsessionmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutApplication.cpp b/kdejava/koala/kdejava/TDEAboutApplication.cpp
index 62a58721..804797c8 100644
--- a/kdejava/koala/kdejava/TDEAboutApplication.cpp
+++ b/kdejava/koala/kdejava/TDEAboutApplication.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutContainer.cpp b/kdejava/koala/kdejava/TDEAboutContainer.cpp
index d5272ea6..61f255b9 100644
--- a/kdejava/koala/kdejava/TDEAboutContainer.cpp
+++ b/kdejava/koala/kdejava/TDEAboutContainer.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsize.h>
 #include <tqstring.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutContributor.cpp b/kdejava/koala/kdejava/TDEAboutContributor.cpp
index 6e36c0a9..c2bca12b 100644
--- a/kdejava/koala/kdejava/TDEAboutContributor.cpp
+++ b/kdejava/koala/kdejava/TDEAboutContributor.cpp
@@ -2,7 +2,7 @@
 #include <tqfont.h>
 #include <tqsize.h>
 #include <tqstring.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutData.cpp b/kdejava/koala/kdejava/TDEAboutData.cpp
index 34f80276..2d9788b5 100644
--- a/kdejava/koala/kdejava/TDEAboutData.cpp
+++ b/kdejava/koala/kdejava/TDEAboutData.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqimage.h>
 #include <tqstring.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutDialog.cpp b/kdejava/koala/kdejava/TDEAboutDialog.cpp
index f3da3112..f6f01300 100644
--- a/kdejava/koala/kdejava/TDEAboutDialog.cpp
+++ b/kdejava/koala/kdejava/TDEAboutDialog.cpp
@@ -2,7 +2,7 @@
 #include <kdialogbase.h>
 #include <tqstring.h>
 #include <tqcolor.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutKDE.cpp b/kdejava/koala/kdejava/TDEAboutKDE.cpp
index 25bcdfcf..ba3d19d3 100644
--- a/kdejava/koala/kdejava/TDEAboutKDE.cpp
+++ b/kdejava/koala/kdejava/TDEAboutKDE.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kaboutkde.h>
+#include <tdeabouttde.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutPerson.cpp b/kdejava/koala/kdejava/TDEAboutPerson.cpp
index 80cc0d4c..e4c79ce0 100644
--- a/kdejava/koala/kdejava/TDEAboutPerson.cpp
+++ b/kdejava/koala/kdejava/TDEAboutPerson.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutTranslator.cpp b/kdejava/koala/kdejava/TDEAboutTranslator.cpp
index 98681284..19f78f53 100644
--- a/kdejava/koala/kdejava/TDEAboutTranslator.cpp
+++ b/kdejava/koala/kdejava/TDEAboutTranslator.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEAboutWidget.cpp b/kdejava/koala/kdejava/TDEAboutWidget.cpp
index 2ccb37bd..c6e11bc5 100644
--- a/kdejava/koala/kdejava/TDEAboutWidget.cpp
+++ b/kdejava/koala/kdejava/TDEAboutWidget.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/TDEApplication.cpp b/kdejava/koala/kdejava/TDEApplication.cpp
index f933775c..58fc80b6 100644
--- a/kdejava/koala/kdejava/TDEApplication.cpp
+++ b/kdejava/koala/kdejava/TDEApplication.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqsessionmanager.h>
diff --git a/kdejava/koala/kdejava/TDECmdLineArgs.cpp b/kdejava/koala/kdejava/TDECmdLineArgs.cpp
index 108c1595..70f507ed 100644
--- a/kdejava/koala/kdejava/TDECmdLineArgs.cpp
+++ b/kdejava/koala/kdejava/TDECmdLineArgs.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/org/kde/koala/KUniqueApplication.java b/kdejava/koala/org/kde/koala/KUniqueApplication.java
index e75e9288..a7fcc087 100644
--- a/kdejava/koala/org/kde/koala/KUniqueApplication.java
+++ b/kdejava/koala/org/kde/koala/KUniqueApplication.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
  or a second instance.  If it is a second instance, it will forward on
  the information to the first instance and then quit.
  The .desktop file for the application should state X-DCOP-ServiceType=Unique,
- see kapplication.h
+ see tdeapplication.h
  If your application is used to open files, it should also support the --tempfile
  option (see TDECmdLineArgs.addTempFileOption()), to delete tempfiles after use.
  Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this.
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 27c4ad22..f4d68972 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -19,7 +19,7 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/kjsembed/bindings/tdeconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp
index e4fe3211..12db7cfd 100644
--- a/kjsembed/bindings/tdeconfig_imp.cpp
+++ b/kjsembed/bindings/tdeconfig_imp.cpp
@@ -24,7 +24,7 @@
 #ifndef QT_ONLY
 #include <tdeconfig.h>
 #include <kstddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdeconfig_imp.moc"
 #else
 #include <tqsettings.h>
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index 4df5666a..75c15024 100644
--- a/kjsembed/cpptests/jsaccess/jsaccess.cpp
+++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp
@@ -19,9 +19,9 @@
 
 #include <kdebug.h>
  
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kjs/interpreter.h>
 
diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp
index 96e5b014..be2e894b 100644
--- a/kjsembed/docs/embedding/simple-embed/main.cpp
+++ b/kjsembed/docs/embedding/simple-embed/main.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include "embedviewimp.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 81c10ae1..2dbbe8e2 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -43,7 +43,7 @@
 
 #ifndef QT_ONLY
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <tdeaction.h>
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 8b2b732b..16f318bf 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -24,9 +24,9 @@
 
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kimageio.h>
 #include <klocale.h>
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 8ea4a8d1..70884cd5 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kinstance.h>
diff --git a/kjsembed/tdescript/javascript.cpp b/kjsembed/tdescript/javascript.cpp
index 22de1aef..eab5ad58 100644
--- a/kjsembed/tdescript/javascript.cpp
+++ b/kjsembed/tdescript/javascript.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "javascript.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kjsembed/kjsembedpart.h>
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 69db4dc5..94107e33 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -17,9 +17,9 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kjs/interpreter.h>
 
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index 66691c9b..7fe664c3 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -17,9 +17,9 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kjs/interpreter.h>
 
diff --git a/korundum/rubylib/examples/rbTDEHTMLPart.rb b/korundum/rubylib/examples/rbTDEHTMLPart.rb
index 55e2386c..27eb4a70 100644
--- a/korundum/rubylib/examples/rbTDEHTMLPart.rb
+++ b/korundum/rubylib/examples/rbTDEHTMLPart.rb
@@ -205,7 +205,7 @@ else
         # this is our KParts::MainWindow derived class
         parts = RbPartsMW.new(nil, "rbParts")
         if ARGV.length > 1
-        # read kcmdlineargs.h for the full unabridged instructions
+        # read tdecmdlineargs.h for the full unabridged instructions
         # on using TDECmdLineArgs, it's pretty confusing at first, but it works
         # This is pretty useless in this program - you might want to
         # expand this in your app (to load a file, etc)
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index 2e8125bb..9e0ab7a2 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #if TDE_VERSION >= 0x030200
 #include <tdeconfigskeleton.h>
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 01239684..12af6baf 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -31,7 +31,7 @@
 #include <tdefile.h>
 #include <tdefileview.h>
 #include <kurl.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeaction.h>
 #include <kdockwidget.h>
 #include <tdefiletreebranch.h>
@@ -39,7 +39,7 @@
 #include <tdehtml_part.h>
 #include <tdeparts/plugin.h>
 #include <kuserprofile.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <karchive.h>
 #if TDE_VERSION >= 0x030200
 #include <tdeconfigskeleton.h>
diff --git a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
index ef923e71..052526b6 100644
--- a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
+++ b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
@@ -27,11 +27,11 @@
 #include <tqdom.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list
index 59979f93..86dcb55b 100644
--- a/smoke/kde/kde_header_list
+++ b/smoke/kde/kde_header_list
@@ -30,10 +30,10 @@ dom/html_list.h
 dom/html_misc.h
 dom/html_object.h
 dom/html_table.h
-kaboutapplication.h
-kaboutdata.h
-kaboutdialog.h
-kaboutkde.h
+tdeaboutapplication.h
+tdeaboutdata.h
+tdeaboutdialog.h
+tdeabouttde.h
 tdeaccelgen.h
 tdeaccel.h
 tdeaccelmanager.h
@@ -45,7 +45,7 @@ kactivelabel.h
 kallocator.h
 kanimwidget.h
 kapp.h
-kapplication.h
+tdeapplication.h
 karchive.h
 kar.h
 karrowbutton.h
@@ -76,7 +76,7 @@ kcatalogue.h
 kcharselect.h
 kcharsets.h
 kclipboard.h
-kcmdlineargs.h
+tdecmdlineargs.h
 kcmenumngr.h
 tdecmodule.h
 tdecmoduleinfo.h
@@ -331,7 +331,7 @@ kstddirs.h
 kstdguiitem.h
 kstringhandler.h
 kstringvalidator.h
-kstyle.h
+tdestyle.h
 tdesycocaentry.h
 tdesycoca.h
 tdesycocatype.h
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp
index 7116a4d3..d59c7e2c 100644
--- a/xparts/mozilla/kmozillapart.cpp
+++ b/xparts/mozilla/kmozillapart.cpp
@@ -2,14 +2,14 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
 #include <kprocess.h>
 #include <tdeparts/mainwindow.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeparts/genericfactory.h>
 
 typedef KParts::GenericFactory<KMozillaPart> KMozillaPartFactory;
diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp
index 2770b95f..2b916dd5 100644
--- a/xparts/mozilla/kshell.cpp
+++ b/xparts/mozilla/kshell.cpp
@@ -3,7 +3,7 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp
index 0ed7181e..cfbe57d2 100644
--- a/xparts/src/kde/xparthost_kpart.cpp
+++ b/xparts/src/kde/xparthost_kpart.cpp
@@ -3,7 +3,7 @@
 #include "xpart_stub.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <assert.h>
 
diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp
index 95d744a4..666c16a6 100644
--- a/xparts/xpart_notepad/shell_xparthost.cpp
+++ b/xparts/xpart_notepad/shell_xparthost.cpp
@@ -4,7 +4,7 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp
index 96c5ef8a..48c184e8 100644
--- a/xparts/xpart_notepad/xp_notepad.cpp
+++ b/xparts/xpart_notepad/xp_notepad.cpp
@@ -1,5 +1,5 @@
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqmultilineedit.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp
index f81ea334..cfb2019b 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.cpp
+++ b/xparts/xpart_notepad/xp_notepad_factory.cpp
@@ -20,7 +20,7 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>