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: Rename common header files for consistency with class renaming

---
 src/kdiff3.cpp                     | 2 +-
 src/kdiff3.h                       | 2 +-
 src/kdiff3_part.cpp                | 2 +-
 src/kdiff3_shell.h                 | 2 +-
 src/kreplacements/kaboutdata.h     | 2 --
 src/kreplacements/kapplication.h   | 2 --
 src/kreplacements/kcmdlineargs.h   | 2 --
 src/kreplacements/tdeaboutdata.h   | 2 ++
 src/kreplacements/tdeapplication.h | 2 ++
 src/kreplacements/tdecmdlineargs.h | 2 ++
 src/main.cpp                       | 4 ++--
 src/optiondialog.cpp               | 2 +-
 src/optiondialog.h                 | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 src/kreplacements/kaboutdata.h
 delete mode 100644 src/kreplacements/kapplication.h
 delete mode 100644 src/kreplacements/kcmdlineargs.h
 create mode 100644 src/kreplacements/tdeaboutdata.h
 create mode 100644 src/kreplacements/tdeapplication.h
 create mode 100644 src/kreplacements/tdecmdlineargs.h

(limited to 'src')

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/kaboutdata.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kaboutdata.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/kapplication.h b/src/kreplacements/kapplication.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kapplication.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/kcmdlineargs.h b/src/kreplacements/kcmdlineargs.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kcmdlineargs.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/tdeaboutdata.h b/src/kreplacements/tdeaboutdata.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeaboutdata.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/kreplacements/tdeapplication.h b/src/kreplacements/tdeapplication.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeapplication.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/kreplacements/tdecmdlineargs.h b/src/kreplacements/tdecmdlineargs.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdecmdlineargs.h
@@ -0,0 +1,2 @@
+#include "kreplacements.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;
-- 
cgit v1.2.1