From fccf6d244a4d60c3138afa81266e22ac65adddbc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:21 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kmplot/kmplot/FktDlg.cpp           | 2 +-
 kmplot/kmplot/FktDlgData.ui        | 2 +-
 kmplot/kmplot/MainDlg.cpp          | 2 +-
 kmplot/kmplot/MainDlg.h            | 4 ++--
 kmplot/kmplot/View.cpp             | 4 ++--
 kmplot/kmplot/View.h               | 4 ++--
 kmplot/kmplot/kconstanteditor.cpp  | 2 +-
 kmplot/kmplot/kmplot.cpp           | 2 +-
 kmplot/kmplot/kparametereditor.cpp | 2 +-
 kmplot/kmplot/ksliderwindow.cpp    | 2 +-
 kmplot/kmplot/ksliderwindow.h      | 2 +-
 kmplot/kmplot/qconstanteditor.ui   | 2 +-
 kmplot/kmplot/settingspagefonts.ui | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kmplot')

diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index eae23ab5..3602e325 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -29,7 +29,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index 90285af2..0f91d5c7 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -419,6 +419,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 879a4f41..c2172ee8 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 
 // local includes
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 8a34ef36..f258999c 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -32,9 +32,9 @@
 #include <tqpicture.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index 1778ee9c..be828f76 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -33,13 +33,13 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 
 // local includes
diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h
index 6d960894..c197d237 100644
--- a/kmplot/kmplot/View.h
+++ b/kmplot/kmplot/View.h
@@ -32,9 +32,9 @@
 
 // KDE includes
 #include <dcopclient.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprinter.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index c2017c8a..a91d3ad1 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 07cd3042..0b13905f 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -25,7 +25,7 @@
 
 #include "kmplot.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index a88fedc4..6b59b08d 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -28,7 +28,7 @@
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 9045c23f..784afe89 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h
index b221f575..e19b25d2 100644
--- a/kmplot/kmplot/ksliderwindow.h
+++ b/kmplot/kmplot/ksliderwindow.h
@@ -26,7 +26,7 @@
 #ifndef KSLIDERWINDOW_H
 #define KSLIDERWINDOW_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "sliderwindow.h"
 
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index 29b3ecb1..30bc937e 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -198,6 +198,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index 872a574c..18d6bb1b 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -121,8 +121,8 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1