From 4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:56:40 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kmplot/kmplot/FktDlg.cpp             | 4 ++--
 kmplot/kmplot/MainDlg.cpp            | 8 ++++----
 kmplot/kmplot/View.cpp               | 6 +++---
 kmplot/kmplot/coordsconfigdialog.cpp | 4 ++--
 kmplot/kmplot/editfunction.cpp       | 4 ++--
 kmplot/kmplot/kconstanteditor.cpp    | 4 ++--
 kmplot/kmplot/keditconstant.cpp      | 4 ++--
 kmplot/kmplot/keditparametric.cpp    | 4 ++--
 kmplot/kmplot/keditpolar.cpp         | 4 ++--
 kmplot/kmplot/kminmax.cpp            | 4 ++--
 kmplot/kmplot/kmplot.cpp             | 4 ++--
 kmplot/kmplot/kmplotio.cpp           | 6 +++---
 kmplot/kmplot/kparametereditor.cpp   | 6 +++---
 kmplot/kmplot/kprinterdlg.cpp        | 2 +-
 kmplot/kmplot/ksliderwindow.cpp      | 2 +-
 kmplot/kmplot/parser.cpp             | 4 ++--
 kmplot/kmplot/xparser.cpp            | 6 +++---
 17 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'kmplot')

diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index c9f417c3..bf0da759 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -30,8 +30,8 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqcstring.h>
 #include <tqcursor.h>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index d7992fae..0c55074d 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -37,9 +37,9 @@
 #include <tdeio/netaccess.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 
 
@@ -768,7 +768,7 @@ void MainDlg::resetZoom()
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  KmPlotPartFactory::s_instance = 0L;
 TDEAboutData* KmPlotPartFactory::s_about = 0L;
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index b580dace..6c60fd50 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -35,10 +35,10 @@
 // KDE includes
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 
diff --git a/kmplot/kmplot/coordsconfigdialog.cpp b/kmplot/kmplot/coordsconfigdialog.cpp
index 4a442080..94dfe465 100644
--- a/kmplot/kmplot/coordsconfigdialog.cpp
+++ b/kmplot/kmplot/coordsconfigdialog.cpp
@@ -23,9 +23,9 @@
 *
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqradiobutton.h>
 
 #include "settings.h"
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index 7e3f9501..2d592676 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -40,8 +40,8 @@
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index 57e3b1e2..d8af85e8 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -28,8 +28,8 @@
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp
index e32bfcd5..04dfa441 100644
--- a/kmplot/kmplot/keditconstant.cpp
+++ b/kmplot/kmplot/keditconstant.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqpushbutton.h>
 
 
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index 8e38d6f6..0d83b3a7 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <kdebug.h>
diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp
index 91c123b0..27334bb6 100644
--- a/kmplot/kmplot/keditpolar.cpp
+++ b/kmplot/kmplot/keditpolar.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 
diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp
index 2a6b3df1..3b947f97 100644
--- a/kmplot/kmplot/kminmax.cpp
+++ b/kmplot/kmplot/kminmax.cpp
@@ -25,8 +25,8 @@
 
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 0b13905f..bbb49a8d 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -31,8 +31,8 @@
 #include <kkeydialog.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp
index a077b6d1..d7812870 100644
--- a/kmplot/kmplot/kmplotio.cpp
+++ b/kmplot/kmplot/kmplotio.cpp
@@ -29,9 +29,9 @@
 
 // KDE includes
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 // ANSI-C includes
 #include <stdlib.h>
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index 6b59b08d..972cd9b4 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -29,10 +29,10 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp
index 6b54ba77..0f9a4cfe 100644
--- a/kmplot/kmplot/kprinterdlg.cpp
+++ b/kmplot/kmplot/kprinterdlg.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local includes
 #include "kprinterdlg.h"
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 784afe89..b2921bbd 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <limits.h>
 #include <math.h>
diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp
index ed064b85..eaa741ff 100644
--- a/kmplot/kmplot/parser.cpp
+++ b/kmplot/kmplot/parser.cpp
@@ -30,8 +30,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "parser.h"
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index d5142d64..acf7ecdb 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -26,10 +26,10 @@
 // KDE includes
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "xparser.h"
-- 
cgit v1.2.1