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

---
 kontact_plugin/basket_plugin.cpp    |  2 +-
 kontact_plugin/uniqueapphandler.cpp |  4 ++--
 src/aboutdata.h                     |  2 +-
 src/application.cpp                 |  2 +-
 src/archive.cpp                     |  2 +-
 src/backup.cpp                      |  4 ++--
 src/basket.cpp                      | 10 +++++-----
 src/basket_options.h                |  2 +-
 src/basketproperties.cpp            |  2 +-
 src/bnpview.cpp                     |  6 +++---
 src/crashhandler.cpp                |  4 ++--
 src/filter.cpp                      |  2 +-
 src/focusedwidgets.h                |  2 +-
 src/formatimporter.cpp              |  2 +-
 src/global.cpp                      |  2 +-
 src/htmlexporter.cpp                |  2 +-
 src/keyboard.cpp                    |  2 +-
 src/kgpgme.cpp                      |  2 +-
 src/kiconcanvas.cpp                 |  2 +-
 src/kicondialog.cpp                 |  2 +-
 src/likeback.cpp                    |  6 +++---
 src/linklabel.cpp                   |  4 ++--
 src/main.cpp                        |  4 ++--
 src/mainwindow.cpp                  |  2 +-
 src/newbasketdialog.cpp             |  2 +-
 src/note.cpp                        |  4 ++--
 src/notedrag.cpp                    |  2 +-
 src/notefactory.cpp                 |  4 ++--
 src/popupmenu.cpp                   |  2 +-
 src/settings.cpp                    |  4 ++--
 src/systemtray.cpp                  |  4 ++--
 src/tag.cpp                         |  6 +++---
 src/tagsedit.cpp                    |  2 +-
 33 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp
index e8cc8ad..8260062 100644
--- a/kontact_plugin/basket_plugin.cpp
+++ b/kontact_plugin/basket_plugin.cpp
@@ -22,7 +22,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kontact/core.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopref.h>
 #include "basketdcopiface_stub.h"
 #include "basket_plugin.h"
diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp
index 39513d6..7f92d18 100644
--- a/kontact_plugin/uniqueapphandler.cpp
+++ b/kontact_plugin/uniqueapphandler.cpp
@@ -21,8 +21,8 @@
 
 #include "uniqueapphandler.h"
 #include <kstartupinfo.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kontact/core.h>
 #include <twin.h>
 #include <dcopclient.h>
diff --git a/src/aboutdata.h b/src/aboutdata.h
index 6130c07..7d8740e 100644
--- a/src/aboutdata.h
+++ b/src/aboutdata.h
@@ -20,7 +20,7 @@
 #ifndef ABOUTDATA_H
 #define ABOUTDATA_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 /**
 	@author Sébastien Laoût <slaout@linux62.org>
diff --git a/src/application.cpp b/src/application.cpp
index 825f776..6e87bbd 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/src/archive.cpp b/src/archive.cpp
index b16f3a7..71700d9 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -29,7 +29,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <tdemainwindow.h>
diff --git a/src/backup.cpp b/src/backup.cpp
index 3bb9593..bc644bd 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -33,8 +33,8 @@
 #include <tqpushbutton.h>
 #include <klocale.h>
 #include <tqdir.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tqgroupbox.h>
 #include <kdirselectdialog.h>
 #include <krun.h>
diff --git a/src/basket.cpp b/src/basket.cpp
index b9a2ab9..e4f6a50 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -22,7 +22,7 @@
 #include <tqdom.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
 #include <tqcursor.h>
@@ -31,7 +31,7 @@
 #include <ktextedit.h>
 #include <tqpoint.h>
 #include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kopenwith.h>
 #include <kservice.h>
@@ -41,7 +41,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tdefiledialog.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klineedit.h>
 #include <ksavefile.h>
 #include <kdebug.h>
@@ -5495,8 +5495,8 @@ void Basket::lock()
 #include <kglobalsettings.h>
 #include <tqevent.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tqinputdialog.h>
 #include <tqdragobject.h>
 #include <kurldrag.h>
diff --git a/src/basket_options.h b/src/basket_options.h
index a4c75a7..9f87c92 100644
--- a/src/basket_options.h
+++ b/src/basket_options.h
@@ -21,7 +21,7 @@
 #ifndef BASKET_OPTIONS_H
 #define BASKET_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 TDECmdLineOptions basket_options[] =
diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp
index 95fc957..cc6b28d 100644
--- a/src/basketproperties.cpp
+++ b/src/basketproperties.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 #include <klocale.h>
 #include <tqstyle.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index a97c99f..755b61a 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -38,14 +38,14 @@
 #include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <twin.h>
 #include <tdeaccel.h>
 #include <kpassivepopup.h>
 #include <kxmlguifactory.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobalaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kkeydialog.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp
index 6d5a76c..822dc38 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -16,8 +16,8 @@
 //#include "debug.h"
 #include "config.h"
 
-#include <kapplication.h> //invokeMailer()
-#include <kaboutdata.h>
+#include <tdeapplication.h> //invokeMailer()
+#include <tdeaboutdata.h>
 #include <tdeversion.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/src/filter.cpp b/src/filter.cpp
index e509454..1b97264 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h
index bec5560..2b72fbc 100644
--- a/src/focusedwidgets.h
+++ b/src/focusedwidgets.h
@@ -26,7 +26,7 @@
 #include <tdefontcombo.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqclipboard.h>
 
 class FocusedTextEdit : public KTextEdit
diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp
index bf2feeb..fd9e87c 100644
--- a/src/formatimporter.cpp
+++ b/src/formatimporter.cpp
@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <iostream>
 
diff --git a/src/global.cpp b/src/global.cpp
index 8cb3227..077d287 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -22,7 +22,7 @@
 #include <kstandarddirs.h>
 #include <tqstring.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqdir.h>
 #include <kdebug.h>
diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp
index f2dc63a..b3b16c6 100644
--- a/src/htmlexporter.cpp
+++ b/src/htmlexporter.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "tag.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
diff --git a/src/keyboard.cpp b/src/keyboard.cpp
index b5e51a0..e6a0300 100644
--- a/src/keyboard.cpp
+++ b/src/keyboard.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h> // it define TQ_WS_X11
+#include <tdeapplication.h> // it define TQ_WS_X11
 
 #include "keyboard.h"
 
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp
index 9a7fbfc..cef755a 100644
--- a/src/kgpgme.cpp
+++ b/src/kgpgme.cpp
@@ -22,7 +22,7 @@
 
 #ifdef HAVE_LIBGPGME
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kpassdlg.h>
 #include <kiconloader.h>
diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp
index ce48126..f9299db 100644
--- a/src/kiconcanvas.cpp
+++ b/src/kiconcanvas.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconviewsearchline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
index 2f736cc..e5786d1 100644
--- a/src/kicondialog.cpp
+++ b/src/kicondialog.cpp
@@ -22,7 +22,7 @@
 #include <kiconviewsearchline.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 7b5d194..53ad0dd 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -18,12 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.         *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqlayout.h>
diff --git a/src/linklabel.cpp b/src/linklabel.cpp
index 6c6628c..bd2157b 100644
--- a/src/linklabel.cpp
+++ b/src/linklabel.cpp
@@ -31,8 +31,8 @@
 #include <tqpainter.h>
 #include <kglobalsettings.h>
 #include <tqstyle.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdialogbase.h>
 #include <tdecmodule.h>
 #include <kdebug.h>
diff --git a/src/main.cpp b/src/main.cpp
index a61cc43..5173d31 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
 #include <klocale.h>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9304c79..7ad7994 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -61,7 +61,7 @@
 #include <kpassivepopup.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <tdeversion.h>
 #include <tqdesktopwidget.h>
diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp
index 39a7e7a..2fa28dd 100644
--- a/src/newbasketdialog.cpp
+++ b/src/newbasketdialog.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <tqsize.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
 
diff --git a/src/note.cpp b/src/note.cpp
index 79d59c8..dfffe8f 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -21,8 +21,8 @@
 #include <tqpainter.h>
 #include <kglobalsettings.h>
 #include <tqstyle.h>
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <tqcursor.h>
 #include <kiconloader.h>
 #include <kpixmapeffect.h>
diff --git a/src/notedrag.cpp b/src/notedrag.cpp
index 8b87ea8..f7b6931 100644
--- a/src/notedrag.cpp
+++ b/src/notedrag.cpp
@@ -25,7 +25,7 @@
 #include <tqbuffer.h>
 #include <kurldrag.h>
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdesktopwidget.h>
 
 #include "basket.h"
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 468a01c..675b34d 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -31,8 +31,8 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdesktopfile.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tqfile.h>
 #include <tdefilemetainfo.h>
 #include <tdeio/jobclasses.h>
diff --git a/src/popupmenu.cpp b/src/popupmenu.cpp
index 403d475..fe2d136 100644
--- a/src/popupmenu.cpp
+++ b/src/popupmenu.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdesktopwidget.h>
 #include <tqpopupmenu.h>
 #include <tqrect.h>
diff --git a/src/settings.cpp b/src/settings.cpp
index 8e2da4a..6a989ee 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -37,8 +37,8 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kgpgme.h>
diff --git a/src/systemtray.cpp b/src/systemtray.cpp
index 03b0261..a011ac6 100644
--- a/src/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -35,13 +35,13 @@
 // To know the program name:
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconeffect.h>
 // Others:
 #include <kmessagebox.h>
 #include <kmanagerselection.h>
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/src/tag.cpp b/src/tag.cpp
index 645b0da..1206cda 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <kiconloader.h>
 #include <tqpainter.h>
 #include <tqfont.h>
@@ -698,7 +698,7 @@ void Tag::createDefaultTagsSet(const TQString &fullPath)
 		DEBUG_WIN << "<font color=red>FAILED to create the tags file</font>!";
 }
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqrect.h>
 #include <tqstyle.h>
 #include <tqcheckbox.h>
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index d6284ba..4af3c4d 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -26,7 +26,7 @@
 #include <kkeybutton.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tqcheckbox.h>
 #include <kpushbutton.h>