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

---
 katapult/common/imagedisplay.cpp        | 2 +-
 katapult/common/imagedisplaysettings.ui | 2 +-
 katapult/katapult/confcatalogs.ui       | 2 +-
 katapult/katapult/katapult.cpp          | 4 ++--
 katapult/katapult/katapult.h            | 2 +-
 katapult/katapult/katapultconfigdlg.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'katapult')

diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index 7ae95f7..27eae8e 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -27,7 +27,7 @@
 #include <kimageeffect.h>
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <klocale.h>
 
 #include <tqpainter.h>
diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 30e5ef6..59c8e8e 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -207,7 +207,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/katapult/katapult/confcatalogs.ui b/katapult/katapult/confcatalogs.ui
index 92253a2..54c9af5 100644
--- a/katapult/katapult/confcatalogs.ui
+++ b/katapult/katapult/confcatalogs.ui
@@ -34,6 +34,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kactionselector.h</includehint>
+    <includehint>tdeactionselector.h</includehint>
 </includehints>
 </UI>
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 1d9bfc2..f6ef5ae 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -23,10 +23,10 @@
 #include <kglobal.h>
 #include <twin.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/componentfactory.h>
 #include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kaboutapplication.h>
 #include <dcopclient.h>
diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h
index be4318b..c1f8b61 100644
--- a/katapult/katapult/katapult.h
+++ b/katapult/katapult/katapult.h
@@ -27,7 +27,7 @@
 
 #include <ksystemtray.h>
 #include <kglobalaccel.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <dcopobject.h>
 
 #include <tqstring.h>
diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp
index 0cffd2c..f9e5122 100644
--- a/katapult/katapult/katapultconfigdlg.cpp
+++ b/katapult/katapult/katapultconfigdlg.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <tdeconfig.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-- 
cgit v1.2.1