Rename additional header files to avoid conflicts with KDE4

katapult/common/imagedisplay.cpp

@@ -20,15 +20,15 @@
 
 #include <imagedisplay.moc>
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <twin.h>
 #include <kimageeffect.h>
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
 #include <tdefontcombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpainter.h>
 #include <tqapplication.h>

katapult/katapult/katapult.cpp

@@ -20,14 +20,14 @@
 
 #include <kapp.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <twin.h>
 #include <kkeydialog.h>
 #include <tdeaction.h>
 #include <tdeparts/componentfactory.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutapplication.h>
 #include <dcopclient.h>
 

katapult/katapult/katapultconfigdlg.cpp

@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqframe.h>
 #include <tqlayout.h>

katapult/katapult/katapultsettings.cpp

@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>

katapult/katapult/main.cpp

@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kapp.h>
 #include <dcopclient.h>
 

katapult/katapult/settings.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file '/home/doros/src/local/kde/katapult/katapult/settings.ui'
 **

katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
@@ -26,7 +26,7 @@
 #include <tqdatastream.h>
 #include <kapp.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <katapultitem.h>
 

katapult/plugins/catalogs/amarokcatalog/song.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
  
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h> 
 #include <kurl.h>
 #include <tqpixmap.h>

katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp

@@ -19,11 +19,11 @@
  ***************************************************************************/
 
 #include <kbookmark.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <krun.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 #include <tqpixmap.h>

katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kbookmark.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "bookmark.h"

katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpixmap.h>
 

katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp

@@ -22,11 +22,11 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <krun.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqclipboard.h>
 

katapult/plugins/catalogs/calculatorcatalog/expression.cpp

@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include <kservice.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "calculatorcatalog.h"

katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp

@@ -18,10 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "actionopendocument.h"
 #include "document.h"

katapult/plugins/catalogs/documentcatalog/directory.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "directory.h"

katapult/plugins/catalogs/execcatalog/actionrun.cpp

@@ -25,9 +25,9 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 
 #include "execcatalog.h"

katapult/plugins/catalogs/execcatalog/command.cpp

@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include <kservice.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 

katapult/plugins/catalogs/googlecatalog/actionsearch.cpp

@@ -25,9 +25,9 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <krun.h>
 

katapult/plugins/catalogs/googlecatalog/query.cpp

@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include <kservice.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 

katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp

@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <krun.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "program.h"
 #include "katapultitem.h"

katapult/plugins/catalogs/programcatalog/program.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <kservice.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "program.h"

katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp

@@ -22,9 +22,9 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqclipboard.h>
 

katapult/plugins/catalogs/spellcatalog/spelling.cpp

@@ -22,7 +22,7 @@
  ***************************************************************************/
 
 #include <kservice.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>