Rename additional header files to avoid conflicts with KDE4

am_edit

@@ -1112,7 +1112,7 @@ sub tag_UIFILES ()
                 $dep_lines .= "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
                 $dep_lines .= "\trm -f $source.$cxxsuffix\n";
                 if (!$kdeopts{"qtonly"}) {
-                    $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n";
+                    $dep_lines .= "\techo '#include <tdelocale.h>' > $source.$cxxsuffix\n";
                     my ($mangled_source) = $source;
                     $mangled_source =~ s/[^A-Za-z0-9]/_/g;  # get rid of garbage
                     $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n";

src/kde-qt.h

@@ -34,15 +34,15 @@
 	#include <tdeapplication.h>
 	#include <tdemainwindow.h>
 	#include <kstatusbar.h>
-	#include <kmenubar.h>
+	#include <tdemenubar.h>
 	#include <tdecmdlineargs.h>
-	#include <klocale.h>
+	#include <tdelocale.h>
 	#include <tdelistview.h>
 	#include <tdefiledialog.h>
 	#include <tdehtml_part.h>
 	#include <ktabwidget.h>
 	#include <tdepopupmenu.h>
-	#include <kmessagebox.h>
+	#include <tdemessagebox.h>
 	#include <kprogress.h>
 	#include <krun.h>