Rename common header files for consistency with class renaming

KDE2PORTING.html

@@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   certain option was specified on the command line and your application 
   now automatically supports --help and --version. It aborts with a
   useful error message when the command line contains a syntax error.
-  See tdelibs/tdecore/kcmdlineargs.h for more info.<P>
+  See tdelibs/tdecore/tdecmdlineargs.h for more info.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 

KDE3PORTING.html

@@ -73,7 +73,7 @@ instead, everything else is source compatible.
 
 <H4>Header file names</H4>
 <UL>
-<LI>kapp.h is now kapplication.h</LI>
+<LI>kapp.h is now tdeapplication.h</LI>
 <LI>kuniqueapp.h is now kuniqueapplication.h</LI>
 <LI>kstddirs.h is now kstandarddirs.h</LI>
 <LI>kcolorbtn.h is now kcolorbutton.h</LI>

arts/kde/kaudioconverter.cc

@@ -37,7 +37,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 using namespace std;
 

arts/kde/kconverttest.cc

@@ -4,9 +4,9 @@
 #include <tqobject.h>
 
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <flowsystem.h>
 #include <kplayobject.h>

arts/kde/kioinputstream_impl.cpp

@@ -29,7 +29,7 @@
  * until the buffer is small enough again.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/kmimetype.h>

arts/kde/kiotest.cc

@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include "qiomanager.h"
 #include "artskde.h"
 

arts/kde/kiotestslow.cc

@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <stdsynthmodule.h>
 #include "qiomanager.h"
 #include "artskde.h"

arts/kde/mcop-dcop/kmcop.cpp

@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <dcopclient.h>
 

arts/knotify/knotify.cpp

@@ -44,12 +44,12 @@
 
 // KDE headers
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #ifndef WITHOUT_ARTS
 #include <kartsdispatcher.h>
 #include <kartsserver.h>
 #endif
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

arts/knotify/knotifytest.cpp

@@ -1,6 +1,6 @@
 #include <string>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 int main(int argc, char **argv)

arts/message/artsmessage.cc

@@ -33,10 +33,10 @@ Gnome, etc. and used instead.
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 // command line options
 static TDECmdLineOptions options[] = 

dcop/HOWTO

@@ -491,7 +491,7 @@ A few back-of-the-napkin tests folks:
 
 Code:
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {

dcop/dcop_deadlock_test.h

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _TESTDCOP_H_
 #define _TESTDCOP_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
 

dcop/tests/driver.cpp

@@ -1,8 +1,8 @@
 #include "driver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqtimer.h>
 #include <tqtimer.h>
 

dcop/tests/test.cpp

@@ -1,8 +1,8 @@
 #include "test.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 

dnssd/domainbrowser.cpp

@@ -26,7 +26,7 @@
 #include "remoteservice.h"
 #include "query.h"
 #include "servicebrowser.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #ifdef HAVE_DNSSD
 #ifdef AVAHI_API_0_6
 #include <avahi-client/lookup.h>

interfaces/tdeimproxy/library/tdeimproxy.cpp

@@ -24,7 +24,7 @@
 #include <tqglobal.h>
 #include <tqpixmapcache.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
 #include <kmessagebox.h>

interfaces/tdescript/sample/shellscript.cpp

@@ -19,7 +19,7 @@
 
 #include "shellscript.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <kgenericfactory.h>

interfaces/tdescript/scriptloader.cpp

@@ -18,7 +18,7 @@
 */
 #include "scriptloader.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
 #include <kglobal.h>

interfaces/tdescript/scriptmanager.cpp

@@ -1,7 +1,7 @@
 #include "scriptmanager.h"
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 

interfaces/tdetexteditor/editorchooser.cpp

@@ -8,7 +8,7 @@
 #include <kservice.h>
 #include <klocale.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 
 #include "editorchooser_ui.h"

interfaces/terminal/test/main.cc

@@ -3,9 +3,9 @@
 #include <ktrader.h>
 #include <klibloader.h>
 #include <tdemainwindow.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
 #include <kmessagebox.h>

kab/addressbook.cc

@@ -21,7 +21,7 @@
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klocale.h>

kabc/address.cpp

@@ -20,7 +20,7 @@
 
 #include "address.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>

kabc/addressbook.cpp

@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>

kabc/key.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "key.h"

kabc/ldapclient.cpp

@@ -29,7 +29,7 @@
 #include <tqtextstream.h>
 #include <tqurl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmdcodec.h>

kabc/lock.cpp

@@ -20,7 +20,7 @@
 
 #include "lock.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

kabc/phonenumber.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "phonenumber.h"

kabc/plugins/dir/resourcedir.cpp

@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

kabc/plugins/file/resourcefile.cpp

@@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/scheduler.h>

kabc/scripts/addressee.src.cpp

@@ -24,7 +24,7 @@
 
 #include <ksharedptr.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include "addresseehelper.h"

kabc/stdaddressbook.cpp

@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>

kabc/tdeab2tdeabc.cpp

@@ -22,9 +22,9 @@
 #include <tqtextstream.h>
 
 #include <kabapi.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kabc/tests/bigread.cpp

@@ -1,10 +1,10 @@
 #include <sys/times.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 "addressbook.h"
 #include "vcardformat.h"

kabc/tests/bigwrite.cpp

@@ -1,10 +1,10 @@
 #include <sys/times.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 "addressbook.h"
 #include "vcardformat.h"

kabc/tests/kabcargl.cpp

@@ -22,10 +22,10 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 

kabc/tests/testaddressee.cpp

@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"

kabc/tests/testaddresseelist.cpp

@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"

kabc/tests/testaddressfmt.cpp

@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include "addressbook.h"

kabc/tests/testaddresslineedit.cpp

@@ -1,8 +1,8 @@
-#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 "addresslineedit.h"
 

kabc/tests/testdb.cpp

@@ -1,8 +1,8 @@
-#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 "addressbook.h"
 #include "vcardformat.h"

kabc/tests/testdistlist.cpp

@@ -1,10 +1,10 @@
 #include <tqwidget.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 "stdaddressbook.h"
 

kabc/tests/testkabc.cpp

@@ -1,8 +1,8 @@
-#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 <kstandarddirs.h>
 
 #include <tqfile.h>

kabc/tests/testkabcdlg.cpp

@@ -1,10 +1,10 @@
 #include <tqwidget.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 "addresseedialog.h"
 

kabc/tests/testldapclient.cpp

@@ -18,9 +18,9 @@
 
 #include "testldapclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqeventloop.h>
 

kabc/tests/testlock.cpp

@@ -23,11 +23,11 @@
 
 #include "stdaddressbook.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 <kdirwatch.h>
 
 #include <kmessagebox.h>

kabc/vcard/testwrite.cpp

@@ -1,8 +1,8 @@
-#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 <VCard.h>
 

kabc/vcardparser/testread.cpp

@@ -25,10 +25,10 @@
 
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "vcardconverter.h"
 #include "vcard.h"

kabc/vcardparser/testwrite.cpp

@@ -24,9 +24,9 @@
 #include <kabc/picture.h>
 #include <kabc/sound.h>
 #include <kabc/secrecy.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>

kate/part/kateconfig.cpp

@@ -27,7 +27,7 @@
 
 #include <math.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kcharsets.h>

kate/part/katedialogs.cpp

@@ -43,7 +43,7 @@
 #include <tdeio/netaccess.h>
 
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcharsets.h>
 #include <kcolorbutton.h>

kate/part/katedocument.cpp

@@ -51,7 +51,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>

kate/part/katefactory.h

@@ -24,7 +24,7 @@
 
 #include <ktrader.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 // katepart version must be a string in double quotes, format: "x.x"
 #define KATEPART_VERSION "2.5"

kate/part/katehighlight.cpp

@@ -44,7 +44,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqstringlist.h>
 #include <tqtextstream.h>

kate/part/kateprinter.cpp

@@ -30,7 +30,7 @@
 #include <kateschema.h>
 #include <katetextline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()

kate/part/kateschema.cpp

@@ -38,8 +38,8 @@
 #include <kmessagebox.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdetexteditor/markinterface.h>
 
 #include <tqbuttongroup.h>

kate/part/kateview.cpp

@@ -55,7 +55,7 @@
 #include <tdeconfig.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <klocale.h>
 #include <kglobal.h>

kate/part/kateviewhelpers.cpp

@@ -32,7 +32,7 @@
 #include "kateview.h"
 #include "kateviewinternal.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <knotifyclient.h>

kate/part/kateviewinternal.cpp

@@ -37,7 +37,7 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
 

kate/part/test_regression.cpp

@@ -31,7 +31,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "katefactory.h"
 #include <tdeio/job.h>
 #include <tdemainwindow.h>

kate/plugins/autobookmarker/autobookmarker.cpp

@@ -29,7 +29,7 @@
 #include <tdetexteditor/document.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>

kate/plugins/wordcompletion/docwordcompletion.cpp

@@ -33,7 +33,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/variableinterface.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>

kded/kded.cpp

@@ -36,8 +36,8 @@
 #include <dcopclient.h>
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kprocess.h>

kded/khostname.cpp

@@ -28,10 +28,10 @@
 
 #include <dcopclient.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>

kded/tde-menu.cpp

@@ -23,9 +23,9 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include "kaboutdata.h"
-#include "kapplication.h"
-#include "kcmdlineargs.h"
+#include "tdeaboutdata.h"
+#include "tdeapplication.h"
+#include "tdecmdlineargs.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kservice.h"

kded/tdebuildsycoca.cpp

@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <kdebug.h>
@@ -48,8 +48,8 @@
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 

kded/tdemimelist.cpp

@@ -8,7 +8,7 @@
 #include <kuserprofile.h>
 #include <kprotocolinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 

kdewidgets/makekdewidgets.cpp

@@ -1,7 +1,7 @@
 /* Copyright (C) 2004-2005 ian reinhart geiser <geiseri@sourcextreme.com> */
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>

kdoctools/meinproc.cpp

@@ -18,9 +18,9 @@
 #include <xslt.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>

kimgio/eps.cpp

@@ -5,7 +5,7 @@
 #include <tqfile.h>
 #include <tqpainter.h>
 #include <tqprinter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 #include "eps.h"

kinit/kinit.cpp

@@ -57,7 +57,7 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #ifdef HAVE_SYS_PRCTL_H

kinit/tdelauncher_main.cpp

@@ -22,9 +22,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "tdelauncher.h"
-#include "kcmdlineargs.h"
+#include "tdecmdlineargs.h"
 #include "kcrash.h"
 #include "kdebug.h"
 #include <stdio.h>

kinit/tests/tdelaunchertest.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <stdio.h>
 #include <tqvaluelist.h>

knewstuff/downloaddialog.cpp

@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <knewstuff/entry.h>

knewstuff/engine.cpp

@@ -22,7 +22,7 @@
 #include <tqdom.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <klocale.h>

knewstuff/ghns.cpp

@@ -25,11 +25,11 @@
 #include <tqtextstream.h>
 #include <tqlabel.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 <kprocess.h>
 #include <kdialog.h>
 

knewstuff/ghns.h

@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"

knewstuff/knewstuff.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

knewstuff/tdehotnewstuff.cpp

@@ -18,11 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "downloaddialog.h"
 

knewstuff/testnewstuff.cpp

@@ -24,11 +24,11 @@
 #include <tqfile.h>
 #include <tqtextstream.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 <kprocess.h>
 #include <kdialog.h>
 

knewstuff/testnewstuff.h

@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"

knewstuff/uploaddialog.cpp

@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 
 #include "engine.h"

kstyles/asteroid/asteroid.h

@@ -7,7 +7,7 @@
 #ifndef __ASTEROID_H
 #define __ASTEROID_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 class AsteroidStyle : public TDEStyle
 {

kstyles/highcolor/highcolor.h

@@ -34,7 +34,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 enum GradientType{ VSmall=0, VMed, VLarge, HMed, HLarge, GradientCount };

kstyles/highcontrast/highcontrast.cpp

@@ -776,7 +776,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 			break;
 		}
 		case KPE_ListViewBranch: 
-			// TODO Draw (thick) dotted line. Check kstyle.cpp
+			// TODO Draw (thick) dotted line. Check tdestyle.cpp
 			// Fall down for now
 		default:
 			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
@@ -1194,7 +1194,7 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element,
 }
 
 // Helper to find the next sibling that's not hidden
-// Lifted from kstyle.cpp
+// Lifted from tdestyle.cpp
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
     TQListViewItem* sibling = item;
@@ -1329,7 +1329,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		// -------------------------------------------------------------------
 		case CC_ListView: {
 			/*
-			 * Sigh... Lifted and modified from kstyle.cpp 
+			 * Sigh... Lifted and modified from tdestyle.cpp 
 			 */
 			/* 
 			 * Many thanks to TrollTech AS for donating CC_ListView from TQWindowsStyle.

kstyles/highcontrast/highcontrast.h

@@ -41,7 +41,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 class TQPopupMenu;

kstyles/keramik/keramik.h

@@ -33,7 +33,7 @@
 #define __keramik_h__
 
 #include <tqframe.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 #include "pixmaploader.h"
 

kstyles/klegacy/klegacystyle.h

@@ -25,7 +25,7 @@
 #ifndef   __KLegacyStyle_hh
 #define   __KLegacyStyle_hh
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 // forward declaration
 class KLegacyStylePrivate;

kstyles/kthemestyle/kthemebase.h

@@ -34,7 +34,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <kpixmap.h>
 #include <tqintcache.h>
 #include <tqstring.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
 #include "kstyledirs.h"

kstyles/light/lightstyle-v2.h

@@ -24,7 +24,7 @@
 #define LIGHTSTYLE_V2_H
 
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 #ifdef QT_PLUGIN

kstyles/light/lightstyle-v3.h

@@ -28,7 +28,7 @@
 #include <tqcommonstyle.h>
 #endif // QT_H
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V3

kstyles/plastik/plastik.h

@@ -39,7 +39,7 @@
 #ifndef __PLASTIK_H
 #define __PLASTIK_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbitmap.h>
 #include <tqintcache.h>
 

kstyles/utils/installtheme/main.cpp

@@ -25,8 +25,8 @@
 #include <tqstringlist.h>
 #include <tqsettings.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>

kstyles/web/webstyle.cpp

@@ -32,7 +32,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdrawutil.h>
 #include <klocale.h>
 #include <kiconloader.h>

kstyles/web/webstyle.h

@@ -20,7 +20,7 @@
 #ifndef WEB_STYLE_H
 #define WEB_STYLE_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqpalette.h>
 
 class TQPainter;

libtdescreensaver/main.cpp

@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 
 #include "tdescreensaver.h"

libtdescreensaver/tdescreensaver.cpp

@@ -20,7 +20,7 @@
 
 #include <tqpainter.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdescreensaver.h"
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>

networkstatus/connectionmanager.cpp

@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstaticdeleter.h>

networkstatus/networkstatus.cpp

@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "clientifaceimpl.h"

networkstatus/testservice.cpp

@@ -21,7 +21,7 @@
 
 #include <tqtimer.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "provideriface.h"
 
 #include "testservice.h"

tdecert/tdecertpart.cc

@@ -22,7 +22,7 @@
 #include "tdecertpart.h"
 #include <tdeparts/genericfactory.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqframe.h>
 #include <klocale.h>
 #include <kdebug.h>

tdecmshell/main.cpp

@@ -27,9 +27,9 @@
 #include <dcopclient.h>
 #include <qxembed.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdecmoduleinfo.h>
 #include <tdecmoduleloader.h>
 #include <tdecmoduleproxy.h>

tdecmshell/main.h

@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmultidialog.h>
 
 /**

tdeconf_update/tdeconf_update.cpp

@@ -31,10 +31,10 @@
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <ktempfile.h>
 

tdecore/CMakeLists.txt

@@ -71,8 +71,8 @@ link_directories(
 install( FILES
     tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h
     tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
-    kurl.h ksock.h kaboutdata.h kcmdlineargs.h tdeconfigbackend.h
-    kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
+    kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
+    kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
@@ -120,7 +120,7 @@ install( FILES eventsrc
 set( target tdecore )
 
 set( ${target}_SRCS
-  libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
+  libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
@@ -134,7 +134,7 @@ set( ${target}_SRCS
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
   kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
-  kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
+  tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp

tdecore/MAINTAINERS

@@ -6,18 +6,18 @@ When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
 dmalloc.cpp
-kaboutdata.cpp		David Faure <faure@kde.org>
+tdeaboutdata.cpp		David Faure <faure@kde.org>
 tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
 tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
 tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
-kapplication.cpp	Waldo Bastian <bastian@kde.org>
+tdeapplication.cpp	Waldo Bastian <bastian@kde.org>
 kaudioplayer.cpp
 kcatalogue.cpp		Hans Petter Bieker <bieker@kde.org>
 kcharsets.cpp		Lars Knoll <knoll@kde.org>
 kckey.cpp
-kcmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
+tdecmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
 kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
 tdeconfig.cpp		Waldo Bastian <bastian@kde.org>

tdecore/Makefile.am

@@ -38,8 +38,8 @@ lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a
 
 include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \
-	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
+	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
+	tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
@@ -89,7 +89,7 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
 
-libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
+libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
@@ -103,7 +103,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
 	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
-	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
+	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
 	ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \

tdecore/kapp.h

@@ -1,6 +1,6 @@
-// kapp.h is the old name. Use #include <kapplication.h> from now on
+// kapp.h is the old name. Use #include <tdeapplication.h> from now on
 #ifdef KDE_NO_COMPAT
-#error include <kapplication.h> instead of <kapp.h>
+#error include <tdeapplication.h> instead of <kapp.h>
 #else
-#include <kapplication.h>
+#include <tdeapplication.h>
 #endif

tdecore/kappdcopiface.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "kappdcopiface.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <tdeconfig.h>

tdecore/kapplication_win.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>

tdecore/kcharsets.cpp

@@ -21,7 +21,7 @@
 #include "kqiodevicegzip_p.h"
 #include "kentities.c"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>

tdecore/kclipboard.cpp

@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 

tdecore/kcompletion.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knotifyclient.h>

tdecore/kcrash.cpp

@@ -46,9 +46,9 @@
 #include <tqwindowdefs.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <../kinit/tdelauncher_cmds.h>

tdecore/kdebug.cpp

@@ -27,7 +27,7 @@
 
 #include "kdebugdcopiface.h"
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kglobal.h"
 #include "kinstance.h"
 #include "kstandarddirs.h"

tdecore/kdesktopfile.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include "kurl.h"
 #include "tdeconfigbackend.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"

tdecore/kdetcompmgr.cpp

@@ -21,9 +21,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>

tdecore/kglobal.cpp

@@ -27,8 +27,8 @@
 #include <tqptrlist.h>
 #include "kglobal.h"
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>

tdecore/kglobalaccel_win.cpp

@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <private/qucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 

tdecore/kglobalaccel_x11.cpp

@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <tqucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 

tdecore/kglobalsettings.cpp

@@ -25,7 +25,7 @@
 
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kipc.h>
 

tdecore/kiconloader.cpp

@@ -26,7 +26,7 @@
 #include <tqmovie.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>

tdecore/kinstance.cpp

@@ -26,7 +26,7 @@
 #include "kiconloader.h"
 #include "tdehardwaredevices.h"
 #include "tdenetworkconnections.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 #include "kglobal.h"

tdecore/klibloader.cpp

@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 #include <tqobjectdict.h>
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"

tdecore/klockfile.cpp

@@ -37,8 +37,8 @@
 #include <tqtextstream.h>
 
 #include <kde_file.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <ktempfile.h>
 

tdecore/kmanagerselection.cpp

@@ -47,7 +47,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kxerrorhandler.h>
 #include <X11/Xatom.h>
 

tdecore/knotifyclient.cpp

@@ -23,9 +23,9 @@
 #include <tqdatastream.h>
 #include <tqptrstack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kdebug.h>

tdecore/kprotocolinfo_tdecore.cpp

@@ -27,7 +27,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
 #include <tdeconfig.h>

tdecore/kprotocolinfofactory.cpp

@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdesycoca.h>
 #include <tdesycocadict.h>

tdecore/krandomsequence.cpp

@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 const int    KRandomSequence::m_nShuffleTableSize = 32;
 

tdecore/krootprop.cpp

@@ -26,7 +26,7 @@
 #include "kglobal.h"
 #include "klocale.h"
 #include "kcharsets.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <tqtextstream.h>
 
 #include <X11/Xlib.h>

tdecore/ksavefile.cpp

@@ -36,7 +36,7 @@
 #include <tqdir.h>
 
 #include <kde_file.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "ksavefile.h"
 #include "kstandarddirs.h"
 

tdecore/ksimpledirwatch.cpp

@@ -43,7 +43,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kglobal.h>

tdecore/ksocks.cpp

@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include "klibloader.h"
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

tdecore/kstartupinfo.cpp

@@ -55,7 +55,7 @@ DEALINGS IN THE SOFTWARE.
 #include <netwm.h>
 #endif
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <signal.h>
 #ifdef Q_WS_X11
 #include <twinmodule.h>

tdecore/ktempdir.cpp

@@ -48,7 +48,7 @@
 #include <tqdir.h>
 
 #include "kglobal.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"
 #include "kstandarddirs.h"

tdecore/ktempfile.cpp

@@ -49,7 +49,7 @@
 #include <tqtextstream.h>
 
 #include "kglobal.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempfile.h"
 #include "kstandarddirs.h"

tdecore/kuniqueapplication.cpp

@@ -34,9 +34,9 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #if defined Q_WS_X11
 #include <twin.h> 

tdecore/kuniqueapplication.h

@@ -21,7 +21,7 @@
 #ifndef _KUNIQUEAPP_H
 #define _KUNIQUEAPP_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopobject.h>
 
 class KUniqueApplicationPrivate;
@@ -36,7 +36,7 @@ class KUniqueApplicationPrivate;
  * 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.

tdecore/kxmessages.cpp

@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kxmessages.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E
 

tdecore/network/kresolverstandardworkers.cpp

@@ -46,7 +46,7 @@
 #include "kdebug.h"
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "kresolver.h"
 #include "tdesocketaddress.h"

tdecore/network/ksockssocketdevice.cpp

@@ -32,7 +32,7 @@
 #define kde_socklen_t ksocklen_t 
 #endif 
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "ksocks.h"
 #include "tdesocketaddress.h"

tdecore/tde-config.cpp.cmake

@@ -1,15 +1,15 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 

tdecore/tde-config.cpp.in

@@ -1,15 +1,15 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 

tdecore/tdeaboutdata.cpp

@@ -20,7 +20,7 @@
  */
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>

tdecore/tdeaccel.cpp

@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include "tdeaccelbase.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeshortcut.h>

tdecore/tdeapplication.cpp

@@ -35,7 +35,7 @@
 #undef QT_NO_TRANSLATION
 #undef TQT_NO_TRANSLATION
 #include <tqtranslator.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #define QT_NO_TRANSLATION
 #define TQT_NO_TRANSLATION
 #include <tqdir.h>
@@ -65,13 +65,13 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <kcrash.h>
 #include <kdatastream.h>
@@ -3635,4 +3635,4 @@ void TDEApplication::virtual_hook( int id, void* data )
 void KSessionManaged::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kapplication.moc"
+#include "tdeapplication.moc"

tdecore/tdecmdlineargs.cpp

@@ -35,10 +35,10 @@
 #include <tqasciidict.h>
 #include <tqstrlist.h>
 
-#include "kcmdlineargs.h"
-#include <kaboutdata.h>
+#include "tdecmdlineargs.h"
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>

tdecore/tdeconfig.cpp

@@ -32,7 +32,7 @@
 
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdeconfigbackend.h"
 
 #include "tdeconfig.h"

tdecore/tdeconfig_compiler/example/autoexample.cpp

@@ -24,11 +24,11 @@
 
 #include "exampleprefs_base.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 <kstandarddirs.h>

tdecore/tdeconfig_compiler/example/example.cpp

@@ -21,11 +21,11 @@
 
 #include "exampleprefs_base.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 <kstandarddirs.h>

tdecore/tdeconfig_compiler/tdeconfig_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>

tdecore/tdeconfigbackend.cpp

@@ -41,7 +41,7 @@
 
 #include "tdeconfigbackend.h"
 #include "tdeconfigbase.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include <klocale.h>

tdecore/tdeconfigbase.cpp

@@ -27,7 +27,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>

tdecore/tdeconfigdialogmanager.cpp

@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdecore/tdehardwaredevices.cpp

@@ -30,7 +30,7 @@
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <libudev.h>

tdecore/tdesycoca.cpp

@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqbuffer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <kdebug.h>

tdecore/tests/KIDLTest.cpp

@@ -1,6 +1,6 @@
 #include "KIDLTest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 KIDLTest::KIDLTest( const TQCString& id )

tdecore/tests/KIDLTestClient.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "KIDLTest_stub.h"

tdecore/tests/dcopkonqtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 

tdecore/tests/kapptest.cpp

@@ -17,11 +17,11 @@
 */
 
 #define private public
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <tdesycoca.h>
 

tdecore/tests/kcalendartest.cpp

@@ -7,12 +7,12 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 class TDELocale;
 

tdecore/tests/kcmdlineargstest.cpp

@@ -1,6 +1,6 @@
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 

tdecore/tests/kglobaltest.cpp

@@ -2,11 +2,11 @@
 
 #include <kglobal.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {

tdecore/tests/kiconloadertest.cpp

@@ -1,7 +1,7 @@
 #include <kiconloader.h>
 #include <tqdatetime.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 

tdecore/tests/kipctest.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <tqobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include "kipctest.h"
 

tdecore/tests/klocaletest.cpp

@@ -14,7 +14,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include "klocale.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 

tdecore/tests/kmacroexpandertest.cpp

@@ -1,7 +1,7 @@
 #include <kmacroexpander.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>

tdecore/tests/kmdcodectest.cpp

@@ -28,8 +28,8 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <kmdcodec.h>
 

tdecore/tests/kmemtest.cpp

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>

tdecore/tests/knotifytest.cpp

@@ -1,5 +1,5 @@
 #include <knotifyclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {

tdecore/tests/kprocesstest.cpp

@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 

tdecore/tests/kprociotest.cpp

@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 

tdecore/tests/krandomsequencetest.cpp

@@ -19,7 +19,7 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <stdio.h>
 

tdecore/tests/kresolvertest.cpp

@@ -40,8 +40,8 @@
 #include <ksocks.h>
 #include <ksockaddr.h>
 #include <kextsock.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "netsupp.h"
 

tdecore/tests/krfcdatetest.cpp

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdecore/tests/ksimpleconfigtest.cpp

@@ -6,7 +6,7 @@
 // demonstrates use of KSimpleConfig class
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <unistd.h>
 #include <stdio.h>
 

tdecore/tests/ksocktest.cpp

@@ -23,8 +23,8 @@
 #include "ksockaddr.h"
 #include "kextsock.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

tdecore/tests/kstddirstest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>

tdecore/tests/ktempfiletest.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "ktempfile.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include <tqstring.h>
 

tdecore/tests/ktimezonestest.cpp

@@ -1,5 +1,5 @@
 #include "ktimezones.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 #include <stdlib.h>
 

tdecore/tests/kuniqueapptest.cpp

@@ -22,8 +22,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 class TestApp : public KUniqueApplication
 {

tdecore/tests/kurltest.cpp

@@ -2,7 +2,7 @@
 
 #include <kurl.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -10,7 +10,7 @@
 #include <tqtextcodec.h>
 #include <tqdatastream.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(TQString txt, TQString a, TQString b)
 {

tdecore/tests/startserviceby.cpp

@@ -16,11 +16,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 

tdecore/tests/tdeconfigtestgui.cpp

@@ -29,7 +29,7 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>

tdecore/tests/tdeconfigtestgui.h

@@ -19,7 +19,7 @@
 #ifndef _KCONFIG_TEST_H
 #define _KCONFIG_TEST_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>

tdecore/tests/tdestdacceltest.cpp

@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdestdaccel.h>
 #include <stdlib.h> // for exit

tdecore/tests/testqtargs.cpp

@@ -28,7 +28,7 @@
   --bg is aliased to --background but If you try it with --background or 
   -background, you get the same thing.
 
-  in tdecore/kapplication.cpp, TDECmdLineOption qt_options is defined and used 
+  in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used 
   by the static method Kapplication::addCmdLineOptions to add the Qt options
   but its' entries look like this:
 
@@ -43,9 +43,9 @@ application palette (light and dark shades are\ncalculated)."), 0},
 
 */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 static const TDECmdLineOptions options[] =

tdecore/twin.cpp

@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include "twin.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <kglobal.h>
 #include <kiconloader.h>

tdecore/twinmodule.cpp

@@ -26,7 +26,7 @@
 #include "twinmodule.h"
 #include "twin.h"
 #include <X11/Xatom.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kdebug.h"
 #include <tqtl.h>
 #include <tqptrlist.h>

tdefx/CMakeLists.txt

@@ -27,7 +27,7 @@ link_directories(
 
 install( FILES
     kpixmap.h kpixmapsplitter.h kpixmapeffect.h
-    kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+    kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -37,7 +37,7 @@ set( target tdefx )
 
 set( ${target}_SRCS
   kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp
-  kimageeffect.cpp kdrawutil.cpp kstyle.cpp kcpuinfo.cpp
+  kimageeffect.cpp kdrawutil.cpp tdestyle.cpp kcpuinfo.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC

tdefx/Makefile.am

@@ -30,10 +30,10 @@ libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/
 	$(top_srcdir)/tdecore/standard_weak.nmcheck
 
 include_HEADERS = kpixmap.h kpixmapsplitter.h \
-	kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+	kpixmapeffect.h kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
 
 libtdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
-		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp kstyle.cpp \
+		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp tdestyle.cpp \
 		kcpuinfo.cpp
 
 METASOURCES = AUTO

tdefx/tdestylen.cpp

@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
@@ -2415,4 +2415,4 @@ void kde_kstyle_set_scrollbar_type_windows( void* style )
 // vim: set noet ts=4 sw=4:
 // kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
 
-#include "kstyle.moc"
+#include "tdestyle.moc"

tdehtml/ecma/kjs_debugwin.cpp

@@ -55,7 +55,7 @@
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcop/dcopclient.h>
 #include <kstringhandler.h> 
 

tdehtml/html/html_documentimpl.cpp

@@ -44,7 +44,7 @@
 #include "dom/dom_exception.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kglobal.h>

tdehtml/html/html_formimpl.cpp

@@ -51,7 +51,7 @@
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #ifndef TDEHTML_NO_WALLET
 #include <tdewallet.h>

tdehtml/java/kjavaappletserver.cpp

@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdeparts/browserextension.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 #include <tdeio/job.h>

tdehtml/java/kjavaappletviewer.cpp

@@ -30,12 +30,12 @@
 #include <tqlabel.h>
 
 #include <klibloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeio/authinfo.h>

tdehtml/java/tests/testkjavaappletserver.cpp

@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #include <stdio.h>

tdehtml/misc/helper.cpp

@@ -29,7 +29,7 @@
 #include <rendering/render_object.h>
 #include <tqptrlist.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqtooltip.h>
 

tdehtml/misc/loader.cpp

@@ -56,7 +56,7 @@
 #include <tqmovie.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kglobal.h>

tdehtml/rendering/render_frames.cpp

@@ -38,7 +38,7 @@
 #include "tdehtml_part.h"
 #include "misc/knsplugininstaller.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <klocale.h>

tdehtml/rendering/render_image.cpp

@@ -30,7 +30,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 

tdehtml/tdehtml_ext.cpp

@@ -53,7 +53,7 @@
 #include <ksavefile.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <krun.h>

tdehtml/tdehtml_factory.cpp

@@ -30,7 +30,7 @@
 #include "misc/arena.h"
 
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include <assert.h>

tdehtml/tdehtml_part.cpp

@@ -91,7 +91,7 @@ using namespace DOM;
 #include <ktempfile.h>
 #include <kglobalsettings.h>
 #include <kurldrag.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/browserinterface.h>
 #if !defined(QT_NO_DRAGANDDROP)
 #include <tdemultipledrag.h>

tdehtml/tdehtmlview.cpp

@@ -61,7 +61,7 @@
 #include "xml/dom2_rangeimpl.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

tdehtml/tdemultipart/tdemultipart.h

@@ -25,7 +25,7 @@
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/browserextension.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqdatetime.h>
 
 class TDEHTMLPart;

tdehtml/test_regression.cpp

@@ -30,7 +30,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -60,7 +60,7 @@
 
 
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "tdehtml_factory.h"
 #include <tdeio/job.h>
 #include <tdemainwindow.h>

tdehtml/test_regression_fontoverload.cpp

@@ -353,7 +353,7 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
     done = true;
 }
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 void TDEApplication::dcopFailure( const TQString & )
 {
     tqDebug( "TDEApplication::dcopFailure" );

tdehtml/testtdehtml.cpp

@@ -2,7 +2,7 @@
 
 #include <stdlib.h>
 #include "decoder.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "html_document.h"
 #include "htmltokenizer.h"
 // to be able to delete a static protected member pointer in kbrowser...
@@ -27,7 +27,7 @@
 #include "html/html_imageimpl.h"
 #include "rendering/render_style.h"
 #include <tdemainwindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeaction.h>
 #include "domtreeview.h"
 #include <tdefiledialog.h>

tdehtml/xml/dom_docimpl.cpp

@@ -77,7 +77,7 @@
 #include "html/html_tableimpl.h"
 #include "html/html_objectimpl.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 
 #include <stdlib.h>

tdeio/bookmarks/kbookmark.cc

@@ -28,7 +28,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kbookmarkmanager.h>
 

tdeio/bookmarks/kbookmarkimporter_crash.cc

@@ -24,7 +24,7 @@
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqdir.h>

tdeio/bookmarks/kbookmarkmanager.cc

@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>

tdeio/bookmarks/kbookmarkmenu.cc

@@ -26,7 +26,7 @@
 #include "kbookmarkimporter_ie.h"
 #include "kbookmarkdrag.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

tdeio/kpasswdserver/kpasswdserver.cpp

@@ -29,7 +29,7 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

tdeio/kssl/ksslcertdlg.cc

@@ -29,7 +29,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kglobalsettings.h>

tdeio/kssl/ksslinfodlg.cc

@@ -30,7 +30,7 @@
 #include <tqscrollview.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprocess.h>

tdeio/kssl/ksslkeygen.cc

@@ -23,7 +23,7 @@
 #include "keygenwizard.h"
 #include "keygenwizard2.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

tdeio/misc/kpac/proxyscout.cpp

@@ -22,7 +22,7 @@
 #include <ctime>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <kprotocolmanager.h>

tdeio/misc/tdefile/fileprops.cpp

@@ -21,9 +21,9 @@
 #include <tqfile.h>
 #include <tqptrlist.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdefilemetainfo.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>

tdeio/misc/tdemailservice.cpp

@@ -16,9 +16,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static const TDECmdLineOptions options[] =
 {

tdeio/misc/tdentlm/tdentlm.cpp

@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kswap.h>
 #include <kmdcodec.h>
 #include <kdebug.h>

tdeio/misc/tdesendbugmail/main.cpp

@@ -8,11 +8,11 @@
 
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kemailsettings.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 

tdeio/misc/tdetelnetservice.cpp

@@ -21,9 +21,9 @@
 
 // $Id$
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>

tdeio/misc/tdewalletd/tdewalletd.cpp

@@ -28,7 +28,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>

tdeio/misc/uiserver.cpp

@@ -29,8 +29,8 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>

tdeio/tdefile/kcombiview.cpp

@@ -32,7 +32,7 @@
 
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdeio/tdefile/kdiroperator.cpp

@@ -32,7 +32,7 @@
 #include <tqvbox.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>

tdeio/tdefile/kdirselectdialog.cpp

@@ -24,7 +24,7 @@
 #include <tqvaluestack.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>

tdeio/tdefile/kicondialog.cpp

@@ -19,7 +19,7 @@
 
 #include <kiconviewsearchline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>

tdeio/tdefile/kimagefilepreview.cpp

@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>

tdeio/tdefile/knotifydialog.cpp

@@ -18,8 +18,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kaudioplayer.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

tdeio/tdefile/kopenwith.cpp

@@ -34,7 +34,7 @@
 #include <tqstyle.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kdesktopfile.h>

tdeio/tdefile/kpropertiesdialog.cpp

@@ -85,7 +85,7 @@ extern "C" {
 }
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kdirsize.h>
 #include <kdirwatch.h>

tdeio/tdefile/kurlbar.cpp

@@ -30,7 +30,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdeio/tdefile/tdefiledetailview.cpp

@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

tdeio/tdefile/tdefiledialog.cpp

@@ -44,9 +44,9 @@
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

tdeio/tdefile/tdefileiconview.cpp

@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdefileitem.h>
 #include <kiconeffect.h>

tdeio/tdefile/tdefilesharedlg.cpp

@@ -37,7 +37,7 @@
 #include <tdeio/tdefileshare.h>
 #include <kseparator.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
 

tdeio/tdefile/tdefileview.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

tdeio/tdefile/tderecentdocument.cpp

@@ -28,7 +28,7 @@
 #include <tderecentdocument.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>

tdeio/tdefile/tests/kcustommenueditortest.cpp

@@ -1,5 +1,5 @@
 #include "kcustommenueditor.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 

tdeio/tdefile/tests/kdirselectdialogtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirselectdialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>

tdeio/tdefile/tests/kfdtest.cpp

@@ -2,7 +2,7 @@
 
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tqtimer.h>
 

tdeio/tdefile/tests/kfstest.cpp

@@ -32,7 +32,7 @@
 #include <tdefileiconview.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
 #include <kdiroperator.h>

tdeio/tdefile/tests/kicondialogtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kicondialog.h>
 
 int main( int argc, char **argv )

tdeio/tdefile/tests/knotifytest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifydialog.h>
 
 int main( int argc, char **argv )

tdeio/tdefile/tests/kopenwithtest.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
 #include <tqdir.h>

tdeio/tdefile/tests/kurlrequestertest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>

tdeio/tdefile/tests/tdefiletreeviewtest.cpp

@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kstatusbar.h>

tdeio/tdeio/defaultprogress.cpp

@@ -22,7 +22,7 @@
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kstringhandler.h>

tdeio/tdeio/job.cpp

@@ -41,7 +41,7 @@ extern "C" {
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>

tdeio/tdeio/kdcopservicestarter.cpp

@@ -18,7 +18,7 @@
 
 #include "kdcopservicestarter.h"
 #include "ktrader.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kservice.h"
 #include <kstaticdeleter.h>
 #include <kdebug.h>

tdeio/tdeio/kdirlister.cpp

@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 #include <tqeventloop.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/job.h>

tdeio/tdeio/kdirwatch.cpp

@@ -54,7 +54,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kglobal.h>

tdeio/tdeio/kimageio.cpp

@@ -11,7 +11,7 @@
 #include"config.h"
 
 #include <tqdir.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqstring.h>
 #include <tqregexp.h>

tdeio/tdeio/kmessageboxwrapper.h

@@ -19,7 +19,7 @@
 #ifndef KMESSAGEBOXWRAPPER_H
 #define KMESSAGEBOXWRAPPER_H
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 /**

tdeio/tdeio/kmimemagic.cpp

@@ -18,7 +18,7 @@
 */
 #include "kmimemagic.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfile.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>

tdeio/tdeio/kmimetype.cpp

@@ -46,7 +46,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

tdeio/tdeio/kprotocolmanager.h

@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/global.h>
 
 /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */

tdeio/tdeio/krun.cpp

@@ -42,7 +42,7 @@
 #include <kdatastream.h>
 #include <kmessageboxwrapper.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>

tdeio/tdeio/kservice.cpp

@@ -37,7 +37,7 @@
 #include <tqtl.h>
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>

tdeio/tdeio/kservicetypefactory.cpp

@@ -24,7 +24,7 @@
 #include "kmimetype.h"
 #include "kuserprofile.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <kstringhandler.h>

tdeio/tdeio/kshred.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // antlarr: KDE 4: Make it const TQString &
 KShred::KShred(TQString fileName)

tdeio/tdeio/kurlcompletion.cpp

@@ -39,7 +39,7 @@
 #include <tqdeepcopy.h>
 #include <tqthread.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <kurl.h>

tdeio/tdeio/kuserprofile.cpp

@@ -22,7 +22,7 @@
 #include "kservicetypefactory.h"
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>

tdeio/tdeio/netaccess.cpp

@@ -33,7 +33,7 @@
 #include <tqfile.h>
 #include <tqmetaobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kdebug.h>

tdeio/tdeio/observer.cpp

@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kurl.h>
 

tdeio/tdeio/previewjob.cpp

@@ -42,7 +42,7 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <ktrader.h>
 #include <kmdcodec.h>

tdeio/tdeio/renamedlg.cpp

@@ -32,7 +32,7 @@
 
 #include <kmessagebox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>

tdeio/tdeio/skipdlg.cpp

@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kpushbutton.h>

tdeio/tdeio/slave.cpp

@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <ksock.h>
 #include <kprocess.h>

tdeio/tdeio/slavebase.cpp

@@ -44,7 +44,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksock.h>
 #include <kcrash.h>
 #include <tdesu/client.h>

tdeio/tdeio/slaveinterface.cpp

@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <tdeio/observer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <time.h>
 #include <tqtimer.h>

tdeio/tdeio/statusbarprogress.cpp

@@ -22,7 +22,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprogress.h>

tdeio/tdeio/tcpslavebase.cpp

@@ -53,7 +53,7 @@
 #include <tqcstring.h>
 #include <tqdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kprotocolmanager.h>
 #include <kde_file.h>

tdeio/tdeioexec/main.cpp

@@ -26,7 +26,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -36,8 +36,8 @@
 #include <kprocess.h>
 #include <kservice.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kstartupinfo.h>
 #include <kshell.h>
 #include <kde_file.h>

tdeio/tests/getalltest.cpp

@@ -2,7 +2,7 @@
 #include <kmimetype.h>
 #include <kservicetype.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 int main(int argc, char *argv[])

tdeio/tests/jobtest.cpp

@@ -22,11 +22,11 @@
 #include <config.h>
 
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klargefile.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kprotocolinfo.h>
 
 #include <tqfileinfo.h>

tdeio/tests/kacltest.cpp

@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <kacl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfileinfo.h>
 #include <tqeventloop.h>

tdeio/tests/kdcopcheck.cpp

@@ -13,7 +13,7 @@
 #include "kdcopcheck.h"
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>

tdeio/tests/kdefaultprogresstest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/defaultprogress.h>
 #include <kurl.h>
 #include <kdebug.h>

tdeio/tests/kdirlistertest.cpp

@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 #include <kdebug.h>
 

tdeio/tests/kdirwatchtest.cpp

@@ -12,7 +12,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "kdirwatchtest.h"
 

tdeio/tests/kdirwatchtest.h

@@ -17,7 +17,7 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 class myTest : public TQObject 
 {

tdeio/tests/kdirwatchunittest.h

@@ -17,7 +17,7 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <tdeunittest/tester.h>
 #include <tdeunittest/module.h>

tdeio/tests/kionetrctest.cpp

@@ -1,7 +1,7 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "authinfo.h"
 

tdeio/tests/kiopassdlgtest.cpp

@@ -1,8 +1,8 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "passdlg.h"
 

tdeio/tests/kmimefromext.cpp

@@ -18,8 +18,8 @@
 
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 

tdeio/tests/kpropsdlgtest.cpp

@@ -1,8 +1,8 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kpropertiesdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 static TDECmdLineOptions options[] =

tdeio/tests/kprotocolinfotest.cpp

@@ -18,10 +18,10 @@
 
 #include <kprotocolinfo.h>
 #include <kprotocolmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <assert.h>
 

tdeio/tests/kruntest.cpp

@@ -21,7 +21,7 @@
 
 #include "kruntest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kshell.h>
 #include <kservice.h>

tdeio/tests/kscantest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kscan.h>
 
 int main( int argc, char **argv )

tdeio/tests/kurifiltertest.cpp

@@ -22,10 +22,10 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 

tdeio/tests/kurlcompletiontest.cpp

@@ -16,14 +16,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kdebug.h>
 #include <tqdir.h>
 #include <assert.h>
 #include <tqfile.h>
 #include <ktempdir.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 
 class KURLCompletionTest

tdeio/tests/metatest.cpp

@@ -1,6 +1,6 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefilemetainfo.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqstringlist.h>
 #include <tqimage.h>
 #include <kdebug.h>

tdeio/tests/netaccesstest.cpp

@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>

tdeio/tests/previewtest.cpp

@@ -3,7 +3,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klineedit.h>
 

tdeio/tests/speed.cpp

@@ -17,11 +17,11 @@
  *  Boston, MA 02110-1301, USA.
  */
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <time.h>
 #include "speed.h"
 #include <tdeio/job.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqdir.h>
 #include <tdeio/global.h>
 

tdeio/tests/tdeioslavetest.cpp

@@ -14,8 +14,8 @@
 #include <tqdir.h>
 
 #include <kacl.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>

tdeio/tests/tdesycocatest.cpp

@@ -28,7 +28,7 @@
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>

tdeio/tests/tdesycocaupdatetest.cpp

@@ -1,6 +1,6 @@
 #include <kservice.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char *argv[])
 {

tdeio/tests/tdetradertest.cpp

@@ -16,10 +16,10 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 
 static TDECmdLineOptions options[] =

tdeioslave/http/http.cc

@@ -62,7 +62,7 @@
 #include <kmimemagic.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kremoteencoding.h>

tdeioslave/http/http_cache_cleaner.cpp

@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kinstance.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>

tdeioslave/http/kcookiejar/kcookieserver.cpp

@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "kcookiejar.h"

tdeioslave/http/kcookiejar/kcookiewin.cpp

@@ -63,7 +63,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kurllabel.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>

tdeioslave/http/kcookiejar/main.cpp

@@ -22,9 +22,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char description[] =
 	I18N_NOOP("HTTP Cookie Daemon");

tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp

@@ -24,9 +24,9 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "../kcookiejar.cpp"

tdeioslave/metainfo/metainfo.cpp

@@ -20,7 +20,7 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>

tdelfeditor/tdelfeditor.cpp

@@ -43,10 +43,10 @@ extern "C" {
 #include <tqfileinfo.h>
 
 #include <kglobal.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 /* return application name */

tdemdi/tdemdi/dockcontainer.cpp

@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 

tdemdi/tdemdi/guiclient.cpp

@@ -22,7 +22,7 @@
 #include "guiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <klocale.h>

tdemdi/tdemdi/mainwindow.cpp

@@ -52,7 +52,7 @@
 #include <tqmenubar.h>
 
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>

tdemdi/tdemdidockcontainer.cpp

@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 

tdemdi/tdemdiguiclient.cpp

@@ -21,7 +21,7 @@
 #include "tdemdiguiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>

tdemdi/tdemdimainfrm.cpp

@@ -44,7 +44,7 @@
 #include <tqmenubar.h>
 
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>

tdemdi/test/main.cpp

@@ -26,7 +26,7 @@
 //----------------------------------------------------------------------------
 
 #ifndef NO_KDE
-# include <kapplication.h>
+# include <tdeapplication.h>
  TDEApplication* theApp;
 #else
 # include <tqapplication.h>

tdeparts/genericfactory.h

@@ -4,7 +4,7 @@
 #include <tdeparts/factory.h>
 #include <tdeparts/part.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 namespace KParts

tdeparts/historyprovider.cpp

@@ -19,7 +19,7 @@
 
 #include <tqdict.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "historyprovider.h"
 

tdeparts/tests/example.cpp

@@ -9,7 +9,7 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <klocale.h>

tdeparts/tests/ghostview.cpp

@@ -1,11 +1,11 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klibloader.h>
 
 #include <tqwidget.h>

tdeparts/tests/normalktm.cpp

@@ -9,7 +9,7 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <klocale.h>

tdeparts/tests/notepad.cpp

@@ -8,8 +8,8 @@
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <klocale.h>

tdeparts/tests/parts.cpp

@@ -12,7 +12,7 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>

tdeprint/cups/cupsdconf2/main.cpp

@@ -21,8 +21,8 @@
 
 #include <tqfile.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 static TDECmdLineOptions options[] =
 {

tdeprint/cups/cupsinfos.cpp

@@ -26,7 +26,7 @@
 #include <tdeio/authinfo.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstringhandler.h>

tdeprint/cups/kmcupsmanager.cpp

@@ -41,7 +41,7 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

tdeprint/kmfactory.cpp

@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeio/authinfo.h>

tdeprint/kmmanager.cpp

@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 #include <unistd.h>
 

tdeprint/kpcopiespage.cpp

@@ -34,7 +34,7 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>

tdeprint/kpfilterpage.cpp

@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 
 KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)

tdeprint/kprintdialog.cpp

@@ -61,7 +61,7 @@
 #include <tdeconfig.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/renamedlg.h>
 
 #include <time.h>

tdeprint/kprinter.cpp

@@ -33,7 +33,7 @@
 #include <tqtl.h>
 #include <tqdir.h>
 #include <tqguardedptr.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>

tdeprint/kprinterimpl.cpp

@@ -34,7 +34,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
 #include <kdebug.h>

tdeprint/kprintpreview.cpp

@@ -32,7 +32,7 @@
 #include <ktrader.h>
 #include <kuserprofile.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>

tdeprint/kprintprocess.cpp

@@ -18,7 +18,7 @@
  **/
 
 #include "kprintprocess.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqfile.h>
 

tdeprint/lpr/matichandler.cpp

@@ -31,7 +31,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <tqfile.h>

tdeprint/management/kaddprinterwizard.cpp

@@ -1,6 +1,6 @@
 #include "kmmanager.h"
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>

tdeprint/management/kmdbcreator.cpp

@@ -25,7 +25,7 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

tdeprint/management/kmdriverdb.cpp

@@ -28,7 +28,7 @@
 #include <tqtextstream.h>
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 KMDriverDB* KMDriverDB::m_self = 0;

tdeprint/management/kmjobviewer.cpp

@@ -39,7 +39,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kmenubar.h>
 #include <kdebug.h>

tdeprint/management/kmmainview.cpp

@@ -54,7 +54,7 @@
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 
 #undef m_manager

tdeprint/management/kmwdrivertest.cpp

@@ -29,7 +29,7 @@
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
 #include <tdeio/netaccess.h>

tdeprint/management/kmwizard.cpp

@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdguiitem.h>
 
 #include "kmwinfopage.h"

tdeprint/management/kmwsocketutil.cpp

@@ -32,7 +32,7 @@
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kextsock.h>
 #include <kdebug.h>

tdeprint/management/kxmlcommanddlg.cpp

@@ -45,7 +45,7 @@
 #include <tdelistbox.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 

tdeprint/messagewindow.cpp

@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqhbox.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 TQPtrDict<MessageWindow> MessageWindow::m_windows;

tdeprint/tdeprintd.cpp

@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqregexp.h>

tdeprint/tests/drawdemo.cpp

@@ -14,7 +14,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqapplication.h>
 #include <math.h>
 

tdeprint/tests/main.cpp

@@ -9,7 +9,7 @@
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwindowsstyle.h>
 #include <tqstylesheet.h>
 #include <stdlib.h>

tderandr/libtderandr.cc

@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdlib.h>
 #include <unistd.h>

tderandr/randr.cpp

@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <kipc.h>

tderesources/configpage.cpp

@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>

tderesources/kcmtderesources.cpp

@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 

tderesources/managerimpl.cpp

@@ -23,8 +23,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

tderesources/resource.cpp

@@ -22,7 +22,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include "resource.h"

tderesources/testresources.cpp

@@ -1,7 +1,7 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "resource.h"
 #include "manager.h"

tdersync/rsyncconfigdialog.cpp

@@ -82,7 +82,7 @@
 #include <kprogressbox.h>
 #include <kpassdlg.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>

tdersync/tdersync.h

@@ -61,7 +61,7 @@
 #include <kprogressbox.h>
 #include <kpassdlg.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>

tdespell2/tests/backgroundtest.cpp

@@ -24,7 +24,7 @@
 #include "broker.h"
 using namespace KSpell2;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 const char *text = "Rationale \

tdespell2/tests/test.cpp

@@ -21,7 +21,7 @@
 #include "broker.h"
 #include "dictionary.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqdatetime.h>

tdespell2/tests/test_config.cpp

@@ -20,7 +20,7 @@
  */
 #include "configdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 

tdespell2/tests/test_configdialog.cpp

@@ -21,7 +21,7 @@
 #include "configdialog.h"
 #include "broker.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 

tdespell2/tests/test_dialog.cpp

@@ -25,7 +25,7 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 

tdespell2/tests/test_filter.cpp

@@ -21,7 +21,7 @@
 #include "filter.h"
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace KSpell2;

tdespell2/tests/test_highlighter.cpp

@@ -22,7 +22,7 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqtextedit.h>

tdesu/client.cpp

@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kde_file.h>
 
 #include "client.h"

tdesu/stub.cpp

@@ -20,7 +20,7 @@
 #include <tqcstring.h>
 #include <kdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 

tdeui/CMakeLists.txt

@@ -53,7 +53,7 @@ install( FILES
     klineeditdlg.h kinputdialog.h kactivelabel.h
     kcharselect.h kcolordrag.h qxembed.h
     knumvalidator.h kdialog.h kdialogbase.h
-    kjanuswidget.h kaboutdialog.h
+    kjanuswidget.h tdeaboutdialog.h
     kauthicon.h kmessagebox.h ksharedpixmap.h
     kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
     tdetoolbarradiogroup.h ktextbrowser.h
@@ -64,7 +64,7 @@ install( FILES
     kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h
     kpixmapio.h kwordwrap.h
     kedittoolbar.h kdockwidget.h kanimwidget.h
-    krootpixmap.h kaboutkde.h kaboutapplication.h
+    krootpixmap.h tdeabouttde.h tdeaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
     kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h
     kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
@@ -117,7 +117,7 @@ set( ${target}_SRCS
   kruler.cpp kcursor.cpp klineeditdlg.cpp
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
-  kjanuswidget.cpp kaboutdialog.cpp
+  kjanuswidget.cpp tdeaboutdialog.cpp
   kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
   tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
@@ -126,8 +126,8 @@ set( ${target}_SRCS
   kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp
   kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp
   kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp
-  kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp
-  kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
+  kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp
+  tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
   tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
   kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp

tdeui/MAINTAINERS

@@ -5,9 +5,9 @@ that class.
 When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
-kaboutapplication.cpp
-kaboutdialog.cpp
-kaboutkde.cpp
+tdeaboutapplication.cpp
+tdeaboutdialog.cpp
+tdeabouttde.cpp
 tdeaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 kanimwidget.cpp		Waldo Bastian <bastian@kde.org>
 karrowbutton.cpp	Frerich Raabe <raabe@kde.org>

tdeui/Makefile.am

@@ -50,7 +50,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		klineeditdlg.h kinputdialog.h kactivelabel.h \
 		kcharselect.h kcolordrag.h qxembed.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
-		kjanuswidget.h kaboutdialog.h \
+		kjanuswidget.h tdeaboutdialog.h \
 		kauthicon.h kmessagebox.h ksharedpixmap.h \
 		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
 		tdetoolbarradiogroup.h ktextbrowser.h \
@@ -61,7 +61,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \
 		kpixmapio.h kwordwrap.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
-		krootpixmap.h kaboutkde.h kaboutapplication.h \
+		krootpixmap.h tdeabouttde.h tdeaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
 		kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h \
 		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
@@ -98,7 +98,7 @@ libtdeui_la_SOURCES = \
 		kruler.cpp kcursor.cpp klineeditdlg.cpp  \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
-		kjanuswidget.cpp kaboutdialog.cpp \
+		kjanuswidget.cpp tdeaboutdialog.cpp \
 		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
 		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
@@ -107,8 +107,8 @@ libtdeui_la_SOURCES = \
 		kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp \
 		kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp \
 		kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp \
-		kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \
-		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
+		kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp \
+		tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
 		tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
 		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \

tdeui/kactivelabel.cpp

@@ -19,7 +19,7 @@
 
 #include "kactivelabel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>

tdeui/kbugreport.cpp

@@ -26,8 +26,8 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>

tdeui/kcharselect.cpp

@@ -36,7 +36,7 @@
 #include <tqtooltip.h>
 #include <tqvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>

tdeui/kcolorcombo.cpp

@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

tdeui/kcolordialog.cpp

@@ -45,7 +45,7 @@
 #include <tqspinbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

tdeui/kdatepicker.cpp

@@ -33,7 +33,7 @@
 
 #include "kdatepicker.h"
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>

tdeui/kdatetbl.cpp

@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeui/kdcopactionproxy.cpp

@@ -20,7 +20,7 @@
 #include "kdcopactionproxy.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>

tdeui/kdetrayproxy/kdetrayproxy.cpp

@@ -19,7 +19,7 @@
 
 #include "kdetrayproxy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <netwm.h>
 #include <X11/Xlib.h>
@@ -182,7 +182,7 @@ void KDETrayProxy::withdrawWindow( Window w )
 #include "kdetrayproxy.moc"
 
 #if 0
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 int main( int argc, char* argv[] )
     {
     TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );

tdeui/kdialog.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
 #include <kdebug.h>

tdeui/kdialogbase.cpp

@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqfocusdata.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>

tdeui/keditcl1.cpp

@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kcmenumngr.h>

tdeui/keditcl2.cpp

@@ -31,7 +31,7 @@
 #include <tqhbox.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kmessagebox.h>

tdeui/keditlistbox.cpp

@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 #include "keditlistbox.h"

tdeui/khelpmenu.cpp

@@ -27,11 +27,11 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kaboutkde.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeabouttde.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
 #include <khelpmenu.h>

tdeui/kiconview.cpp

@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 
 #include <kcursor.h>

tdeui/kjanuswidget.cpp

@@ -33,7 +33,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h> // Access to some static members
 #include <klocale.h>
 #include <kglobal.h>

tdeui/kkeybutton.cpp

@@ -24,7 +24,7 @@
 #include <tqcursor.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
 #include <klocale.h>

tdeui/kkeydialog.cpp

@@ -39,7 +39,7 @@
 #include <tdeaction.h>
 #include <tdeaccelaction.h>
 #include <tdeactionshortcutlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -51,7 +51,7 @@
 #include <tdeshortcut.h>
 #include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
 #ifdef Q_WS_X11

tdeui/kled.cpp

@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include "kled.h"
 

tdeui/klineedit.cpp

@@ -40,7 +40,7 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "klineedit.h"
 #include "klineedit.moc"

tdeui/klineeditdlg.cpp

@@ -28,7 +28,7 @@
 
 #include <kbuttonbox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
 

tdeui/kmenubar.cpp

@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmenubar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kmanagerselection.h>

tdeui/kmessagebox.cpp

@@ -31,7 +31,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

tdeui/kpanelapplet.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kpanelapplet.h"
 #include "kpanelapplet.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate

tdeui/kpanelappmenu.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelappmenu.h"
 #include <tqstringlist.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 static int panelmenu_get_seq_id()

tdeui/kpassdlg.cpp

@@ -36,11 +36,11 @@
 
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>

tdeui/kprogress.cpp

@@ -34,7 +34,7 @@
 
 #include "kprogress.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 

tdeui/kprogressbox.cpp

@@ -37,7 +37,7 @@
 #include "ktextedit.h"
 #include "kprogressbox.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <twin.h>
 

tdeui/kpushbutton.cpp

@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class KPushButton::KPushButtonPrivate
 {

tdeui/krootpixmap.cpp

@@ -14,7 +14,7 @@
 #include <tqrect.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
 #include <twinmodule.h>

tdeui/ksconfig.cpp

@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>

tdeui/kseparator.cpp

@@ -20,7 +20,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kseparator.moc"
 

tdeui/ksharedpixmap.cpp

@@ -22,7 +22,7 @@
 
 #ifdef Q_WS_X11
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krootprop.h>
 #include <ksharedpixmap.h>
 #include <kdebug.h>

tdeui/kstdaction.cpp

@@ -21,9 +21,9 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

tdeui/kstdguiitem.cpp

@@ -20,7 +20,7 @@
 
 #include <kguiitem.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
 {

tdeui/ksyntaxhighlighter.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdespell.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "ksyntaxhighlighter.h"
 

tdeui/ksystemtray.cpp

@@ -24,9 +24,9 @@
 #include "tdeshortcut.h"
 #include "ksystemtray.h"
 #include "tdepopupmenu.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klocale.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 
 #ifdef Q_WS_X11
 #include <twin.h>

tdeui/ktextbrowser.cpp

@@ -19,7 +19,7 @@
 
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <ktextbrowser.h>
 #include <kcursor.h>

tdeui/ktip.cpp

@@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtextstream.h>
 #include <tqimage.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdeui/kwhatsthismanager.cpp

@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tqtextedit.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KWhatsThisManager *KWhatsThisManager::s_instance = 0;
 

tdeui/kxmlguibuilder.cpp

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kxmlguibuilder.h"
 #include "kmenubar.h"
 #include "tdepopupmenu.h"

tdeui/kxmlguiclient.cpp

@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <assert.h>
 

tdeui/tdeaboutapplication.cpp

@@ -23,10 +23,10 @@
 // I (espen) prefer that header files are included alphabetically
 
 #include <tqlabel.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kaboutdialog_private.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kurllabel.h>

tdeui/tdeaboutapplication.h

@@ -23,8 +23,8 @@
 #ifndef _KABOUT_APPLICATION_H_
 #define _KABOUT_APPLICATION_H_
 
-#include <kaboutdata.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About Application" dialog box.

tdeui/tdeaboutdialog.cpp

@@ -31,13 +31,13 @@
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <ktextbrowser.h>
 #include <kurllabel.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <kaboutdialog_private.h>
 #include <kdebug.h>
 
@@ -50,7 +50,7 @@ template class TQPtrList<TDEAboutContributor>;
 
 // ##############################################################
 // MOC OUTPUT FILES:
-#include "kaboutdialog.moc"
+#include "tdeaboutdialog.moc"
 #include "kaboutdialog_private.moc"
 // ##############################################################
 

tdeui/tdeabouttde.cpp

@@ -20,8 +20,8 @@
  */
 
 // I (espen) prefer that header files are included alphabetically
-#include <kaboutkde.h>
-#include <kapplication.h>
+#include <tdeabouttde.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 

tdeui/tdeabouttde.h

@@ -22,7 +22,7 @@
 #ifndef _KABOUT_KDE_H_
 #define _KABOUT_KDE_H_
 
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About KDE" dialog box,

tdeui/tdeaction.cpp

@@ -33,7 +33,7 @@
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
 #include <tdeaccelprivate.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 #include <tdemainwindow.h>

tdeui/tdeactionclasses.cpp

@@ -42,7 +42,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontcombo.h>

tdeui/tdeactioncollection.cpp

@@ -31,7 +31,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaccelbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqpopupmenu.h>

tdeui/tdecmodule.cpp

@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
 #include <kdebug.h>

tdeui/tdefontdialog.cpp

@@ -41,7 +41,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>

tdeui/tdelistbox.cpp

@@ -21,7 +21,7 @@
 
 #include <kglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 #include <kdebug.h>
 

tdeui/tdelistview.cpp

@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 

tdeui/tdemainwindow.cpp

@@ -36,7 +36,7 @@
 
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>

tdeui/tdemainwindowiface.cpp

@@ -20,7 +20,7 @@
 #include "tdemainwindowiface.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
 #include <tdemainwindow.h>

tdeui/tdepopupmenu.cpp

@@ -30,7 +30,7 @@
 #include "tdepopupmenu.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TDEPopupTitle::TDEPopupTitle(TQWidget *parent, const char *name)
     : TQWidget(parent, name)

tdeui/tdeshortcutdialog.cpp

@@ -52,7 +52,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

tdeui/tdespell.cpp

@@ -37,7 +37,7 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>

tdeui/tdespelldlg.cpp

@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>

tdeui/tdetoolbar.cpp

@@ -47,7 +47,7 @@
 #include <klineedit.h>
 #include <kseparator.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>

tdeui/tdetoolbarbutton.cpp

@@ -38,7 +38,7 @@
 #include <tqpainter.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

tdeui/tdetoolbarhandler.cpp

@@ -19,7 +19,7 @@
 #include "tdetoolbarhandler.h"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
 #include <klocale.h>

tdeui/tests/itemcontainertest.cpp

@@ -16,7 +16,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>

tdeui/tests/kaboutdialogtest.cpp

@@ -8,10 +8,10 @@
  * $Revision$
  */
 
-#include "kaboutdialog.h"
+#include "tdeaboutdialog.h"
 // #include <kimgio.h>
 #include <tqimage.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)

tdeui/tests/kblendtest.cpp

@@ -1,5 +1,5 @@
 #include "kblendtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>

tdeui/tests/kbuttonboxtest.cpp

@@ -16,7 +16,7 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kbuttonbox.h"
 #include <tqlayout.h>
 #include <tqlabel.h>

tdeui/tests/kcharselecttest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include "kcharselect.h"
 

tdeui/tests/kcolordlgtest.cpp

@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kcolordialog.h"
 #include <tdeconfig.h>
 #include <klocale.h>

tdeui/tests/kcolortest.cpp

@@ -1,6 +1,6 @@
 
 #include "kcolortest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <stdio.h>
 #include <tqdatetime.h>

tdeui/tests/kcomboboxtest.cpp

@@ -6,7 +6,7 @@
 
 #include <assert.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>

tdeui/tests/kcompletiontest.cpp

@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 /*

tdeui/tests/kdatepicktest.cpp

@@ -1,6 +1,6 @@
 #include "kdatepicker.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)

tdeui/tests/kdatetimewidgettest.cpp

@@ -1,5 +1,5 @@
 #include "kdatetimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)

tdeui/tests/kdatewidgettest.cpp

@@ -1,6 +1,6 @@
 #include "kdatewidget.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)

tdeui/tests/kdesattest.cpp

@@ -1,5 +1,5 @@
 #include "kdesattest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>

tdeui/tests/kdialogbasetest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include <tqstring.h>

tdeui/tests/kdocktest.cpp

@@ -1,6 +1,6 @@
 #include "kdocktest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tqwidget.h>

tdeui/tests/kdockwidgetdemo.cpp

@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
 

tdeui/tests/kdockwidgettest.cpp

@@ -15,7 +15,7 @@
 #include "kdockwidgettest.h"
 
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>

tdeui/tests/kdualcolortest.cpp

@@ -1,6 +1,6 @@
 #include "kdualcolortest.h"
 #include <kdualcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqlayout.h>
 #include <tqpalette.h>

tdeui/tests/keditlistboxtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
 

tdeui/tests/kedittest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditcl.h>
 #include <tqpopupmenu.h>
 

tdeui/tests/kgradienttest.cpp

@@ -1,5 +1,5 @@
 #include "kgradienttest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>

tdeui/tests/khashtest.cpp

@@ -1,5 +1,5 @@
 #include "khashtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>

tdeui/tests/kinputdialogtest.cpp

@@ -3,7 +3,7 @@
  * License: GPL V2
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 

tdeui/tests/kjanuswidgettest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kjanuswidget.h>
 
 #include <tqstring.h>

tdeui/tests/kledtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>

tdeui/tests/klineeditdlgtest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineeditdlg.h>
 
 #include <tqstring.h>

tdeui/tests/klineedittest.cpp

@@ -4,9 +4,9 @@
 #include <tqhbox.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>

tdeui/tests/kmessageboxtest.cpp

@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kglobal.h>
 

tdeui/tests/knuminputtest.cpp

@@ -11,7 +11,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 #include "knuminputtest.h"

tdeui/tests/kpalettetest.cpp

@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>

tdeui/tests/kpanelmenutest.cpp

@@ -1,5 +1,5 @@
 #include "kpanelmenutest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 

tdeui/tests/kpixmapregionselectordialogtest.cpp

@@ -1,8 +1,8 @@
 #include "kpixmapregionselectordialog.h"
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <iostream>
 
 static const TDECmdLineOptions options[] =

tdeui/tests/kprogresstest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "kprogress.h"
 

tdeui/tests/krulertest.h

@@ -3,7 +3,7 @@
 #ifndef krulertest_h
 #define krulertest_h
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>

tdeui/tests/kseparatortest.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqwidget.h>
 

tdeui/tests/ksqueezedtextlabeltest.cpp

@@ -1,5 +1,5 @@
 #include "ksqueezedtextlabel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {

tdeui/tests/kstatusbartest.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "kstatusbar.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kmenubar.h>
 #include "kstatusbartest.h"

tdeui/tests/ksystemtraytest.cpp

@@ -1,5 +1,5 @@
 #include <ksystemtray.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {

tdeui/tests/ktabctltest.cpp

@@ -2,7 +2,7 @@
  *
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqobject.h>

tdeui/tests/ktabwidgettest.cpp

@@ -2,8 +2,8 @@
 #include <tqlayout.h>
 #include <tqdragobject.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 

tdeui/tests/ktextedittest.cpp

@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktextedit.h>
 
 #include <tqfile.h>

tdeui/tests/ktimewidgettest.cpp

@@ -1,5 +1,5 @@
 #include "ktimewidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 int main(int argc, char** argv)

tdeui/tests/kunbalancedgrdtest.cpp

@@ -1,5 +1,5 @@
 #include "kunbalancedgrdtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqstring.h>

tdeui/tests/kwizardtest.cpp

@@ -20,7 +20,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kwizard.h>
 
 int main(int argc, char **argv)

tdeui/tests/kwordwraptest.cpp

@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqwidget.h>
 #include "kwordwrap.h"

tdeui/tests/kxmlguitest.cpp

@@ -1,5 +1,5 @@
 #include "kxmlguitest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>

tdeui/tests/tdeactiontest.cpp

@@ -1,7 +1,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 
 #include <assert.h>

tdeui/tests/tdefontdialogtest.cpp

@@ -24,7 +24,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "tdefontdialog.h"
 #include <tdeconfig.h>
 

tdeui/tests/tdelistviewtest.cpp

@@ -1,5 +1,5 @@
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
 

tdeui/tests/tdemainwindowrestoretest.cpp

@@ -1,7 +1,7 @@
 
 #include "tdemainwindowrestoretest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 

tdeui/tests/tdemainwindowtest.cpp

@@ -1,7 +1,7 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
 

tdeui/tests/tdepopuptest.cpp

@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
 #include "tdepopupmenu.h"

tdeui/tests/tdespelltest.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "tdespell.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqstring.h>

tdeui/tests/tdetoolbarlabelactiontest.cpp

@@ -18,7 +18,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <klineedit.h>
 #include <tdelistview.h>

tdeui/tests/twindowtest.cpp

@@ -9,10 +9,10 @@
 #include <stdlib.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <khelpmenu.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmenubar.h>
 #include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>

tdeui/twindowlistmenu.cpp

@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kstringhandler.h>
 
 #include <netwm.h> 
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <dcopclient.h>
 
 #undef Bool