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

---
 kdiff3plugin/kdiff3plugin.cpp                          | 2 +-
 src/kdiff3.cpp                                         | 2 +-
 src/kdiff3.h                                           | 2 +-
 src/kdiff3_part.cpp                                    | 2 +-
 src/kdiff3_shell.h                                     | 2 +-
 src/kreplacements/{kaboutdata.h => tdeaboutdata.h}     | 0
 src/kreplacements/{kapplication.h => tdeapplication.h} | 0
 src/kreplacements/{kcmdlineargs.h => tdecmdlineargs.h} | 0
 src/main.cpp                                           | 4 ++--
 src/optiondialog.cpp                                   | 2 +-
 src/optiondialog.h                                     | 2 +-
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename src/kreplacements/{kaboutdata.h => tdeaboutdata.h} (100%)
 rename src/kreplacements/{kapplication.h => tdeapplication.h} (100%)
 rename src/kreplacements/{kcmdlineargs.h => tdecmdlineargs.h} (100%)

diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 14442cb..3142c98 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -20,7 +20,7 @@
 
 #include "kdiff3plugin.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
 #include <klocale.h>
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index d7a3df2..9922812 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kprinter.h>
 //#include <kkeydialog.h>
 
diff --git a/src/kdiff3.h b/src/kdiff3.h
index ff0ed8c..3bd90f9 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -30,7 +30,7 @@
 #include <tqscrollbar.h>
 
 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp
index f43381b..eb0fe8a 100644
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@@ -251,7 +251,7 @@ bool KDiff3Part::saveFile()
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  KDiff3PartFactory::s_instance = 0L;
diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h
index d9c5357..01389b5 100644
--- a/src/kdiff3_shell.h
+++ b/src/kdiff3_shell.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;
diff --git a/src/kreplacements/kaboutdata.h b/src/kreplacements/tdeaboutdata.h
similarity index 100%
rename from src/kreplacements/kaboutdata.h
rename to src/kreplacements/tdeaboutdata.h
diff --git a/src/kreplacements/kapplication.h b/src/kreplacements/tdeapplication.h
similarity index 100%
rename from src/kreplacements/kapplication.h
rename to src/kreplacements/tdeapplication.h
diff --git a/src/kreplacements/kcmdlineargs.h b/src/kreplacements/tdecmdlineargs.h
similarity index 100%
rename from src/kreplacements/kcmdlineargs.h
rename to src/kreplacements/tdecmdlineargs.h
diff --git a/src/main.cpp b/src/main.cpp
index 510961d..3733e00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include "kdiff3_shell.h"
 #include <kstandarddirs.h>
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 512357b..1bd4372 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -33,7 +33,7 @@
 #include <tqvbuttongroup.h>
 #include <tqsettings.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbtn.h>
 #include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
diff --git a/src/optiondialog.h b/src/optiondialog.h
index 5e2945c..b097294 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -32,7 +32,7 @@ class TDEConfig;
 #include <kdialogbase.h>
 #include <tqstringlist.h>
 #include <list>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 class OptionItem;
 class OptionCheckBox;