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

---
 buildtools/ada/adaproject_part.cpp                     | 2 +-
 buildtools/ant/antprojectpart.cpp                      | 4 ++--
 buildtools/autotools/autodetailsview.cpp               | 6 +++---
 buildtools/autotools/autoprojectpart.cpp               | 2 +-
 buildtools/autotools/autoprojectviewbase.ui            | 2 +-
 buildtools/autotools/autoprojectwidget.cpp             | 4 ++--
 buildtools/autotools/autosubprojectview.cpp            | 6 +++---
 buildtools/autotools/autotoolsaction.h                 | 2 +-
 buildtools/autotools/choosetargetdialog.cpp            | 2 +-
 buildtools/autotools/choosetargetdlgbase.ui            | 2 +-
 buildtools/autotools/fileselectorwidget.h              | 2 +-
 buildtools/autotools/removetargetdlg.cpp               | 2 +-
 buildtools/autotools/removetargetdlgbase.ui            | 2 +-
 buildtools/custommakefiles/customprojectpart.cpp       | 6 +++---
 buildtools/custommakefiles/selectnewfilesdialog.cpp    | 2 +-
 buildtools/custommakefiles/selectnewfilesdialogbase.ui | 2 +-
 buildtools/lib/widgets/environmentdisplaydialog.cpp    | 2 +-
 buildtools/lib/widgets/environmentdisplaydialogbase.ui | 2 +-
 buildtools/pascal/pascalproject_part.cpp               | 2 +-
 buildtools/qmake/choosesubprojectdlg.h                 | 2 +-
 buildtools/qmake/choosesubprojectdlgbase.ui            | 2 +-
 buildtools/qmake/disablesubprojectdlg.cpp              | 2 +-
 buildtools/qmake/disablesubprojectdlgbase.ui           | 2 +-
 buildtools/qmake/projectconfigurationdlg.h             | 2 +-
 buildtools/qmake/projectconfigurationdlgbase.ui        | 2 +-
 buildtools/qmake/trolllistview.h                       | 2 +-
 buildtools/qmake/trollprojectpart.cpp                  | 2 +-
 buildtools/qmake/trollprojectwidget.cpp                | 6 +++---
 buildtools/script/scriptprojectpart.cpp                | 2 +-
 29 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 25aa79f7..ba77c3d3 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -17,7 +17,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index 2925f240..902055ec 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -13,8 +13,8 @@
 
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index d07329ff..82c7a22c 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -24,12 +24,12 @@
 
  /** KDE Libs */
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 
 /** KDevelop */
 #include "kdevappfrontend.h"
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 81877df9..c9701385 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -33,7 +33,7 @@
 
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index e35219f0..5419e520 100644
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@@ -118,6 +118,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 6ac797b9..a6341b0b 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -34,13 +34,13 @@
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tdefile.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kdevcore.h"
 #include "domutil.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 42223c15..1226d972 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -22,16 +22,16 @@
 
 /** KDE Libs */
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /** KDevelop */
 #include <kdevmainwindow.h>
diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h
index 2d397359..dd9ddda5 100644
--- a/buildtools/autotools/autotoolsaction.h
+++ b/buildtools/autotools/autotoolsaction.h
@@ -15,7 +15,7 @@
 #define AUTOTOOLSACTION_H
 
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQObject;
 class TDEActionCollection;
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index 48622053..ef33ae14 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index 3cd16825..6e3d5096 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -217,6 +217,6 @@
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index a9b7abd7..67becdc7 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -19,7 +19,7 @@
 #include <tqstrlist.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 #include <tdefile.h>
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 10dc1f06..6bf6da27 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -28,7 +28,7 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
 #include <klocale.h>
diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui
index 57b947a6..b7e918cf 100644
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@@ -258,7 +258,7 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kprogress.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index a2437019..39f2fde6 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -26,7 +26,7 @@
 #include <tqwhatsthis.h>
 #include <tqdom.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
@@ -34,10 +34,10 @@
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 #include <kprocess.h>
 
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index a4c0db99..ce418ad4 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -13,7 +13,7 @@
 #include "selectnewfilesdialog.h"
 
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
 #include <klocale.h>
diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
index e922d0e3..d56df24b 100644
--- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui
+++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
@@ -45,6 +45,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp
index 1a809459..4ac95ca7 100644
--- a/buildtools/lib/widgets/environmentdisplaydialog.cpp
+++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <unistd.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 
 #include "environmentdisplaydialog.h"
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index 99758459..eb2903ac 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -106,6 +106,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index f77f23ca..f1ee2758 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h
index 18656480..e59ed6b9 100644
--- a/buildtools/qmake/choosesubprojectdlg.h
+++ b/buildtools/qmake/choosesubprojectdlg.h
@@ -12,7 +12,7 @@
 #ifndef CHOOSESUBPROJECTDLG_H
 #define CHOOSESUBPROJECTDLG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "choosesubprojectdlgbase.h"
 
diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui
index d5f6566d..e9ef33f5 100644
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@@ -128,7 +128,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp
index c05c70c9..9a5fbb1d 100644
--- a/buildtools/qmake/disablesubprojectdlg.cpp
+++ b/buildtools/qmake/disablesubprojectdlg.cpp
@@ -10,7 +10,7 @@
 ***************************************************************************/
 
 #include "disablesubprojectdlg.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 #include "scope.h"
 #include "qmakescopeitem.h"
diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui
index c1d09af1..863e28f8 100644
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@@ -119,7 +119,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h
index d02ff7e4..7452e9e6 100644
--- a/buildtools/qmake/projectconfigurationdlg.h
+++ b/buildtools/qmake/projectconfigurationdlg.h
@@ -22,7 +22,7 @@
 //#include "trollprojectwidget.h"
 #include <tdeversion.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 
 class QMakeScopeItem;
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 24bcfeb1..0427a730 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -2886,7 +2886,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h
index 13d2d9a1..8c2c021f 100644
--- a/buildtools/qmake/trolllistview.h
+++ b/buildtools/qmake/trolllistview.h
@@ -20,7 +20,7 @@
 #ifndef TROLLLISTVIEW_H
 #define TROLLLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "trollprojectwidget.h"
 
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index a86be38a..4f125d68 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -28,7 +28,7 @@
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 69f71bd4..19b74609 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -42,15 +42,15 @@
 #include <tdefiledialog.h>
 #include <tqtooltip.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tqmessagebox.h>
 #include <iostream>
 #include <tdeparts/part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kinputdialog.h>
 #include <tdeversion.h>
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index 1c3ab20b..bd9c0747 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -17,7 +17,7 @@
 #include <tqvaluestack.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1