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/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 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'buildtools/autotools')

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>
-- 
cgit v1.2.1