Rename many classes and header files to avoid conflicts with KDE4

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>

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>

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>

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>

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>

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>