Rename additional header files to avoid conflicts with KDE4

admin/kde.py

@@ -382,7 +382,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		act=[]
 		act.append('$QT_UIC $QT_UIC_HFLAGS -o '+target[0].path+' '+source[0].path)
 		act.append('rm -f '                           +target[1].path)
-		act.append('echo \'#include <klocale.h>\' >> '+target[1].path)
+		act.append('echo \'#include <tdelocale.h>\' >> '+target[1].path)
 		act.append('echo \'#include <kdialog.h>\' >> '+target[1].path)
 		act.append('$QT_UIC $QT_UIC_CFLAGS -impl '+target[0].path+' -o '+target[1].path+'.tmp '+source[0].path)
 		act.append('cat '+target[1].path+'.tmp >> '+target[1].path)

kde.py

@@ -483,7 +483,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		act=[]
 		act.append('$QT_UIC $QT_UIC_HFLAGS -o '+target[0].path+' '+source[0].path)
 		act.append('rm -f '                           +target[1].path)
-		act.append('echo \'#include <klocale.h>\' >> '+target[1].path)
+		act.append('echo \'#include <tdelocale.h>\' >> '+target[1].path)
 		act.append('echo \'#include <kdialog.h>\' >> '+target[1].path)
 		act.append('$QT_UIC $QT_UIC_CFLAGS -impl '+target[0].path+' -o '+target[1].path+'.tmp '+source[0].path)
 		act.append('cat '+target[1].path+'.tmp >> '+target[1].path)

src/addnewstreamimpl.cpp

@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 #include <tqlineedit.h>

src/kstreamripper.cpp

@@ -20,7 +20,7 @@
 
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kled.h>
 #include <tdefiledialog.h>
 #include <tdeaboutapplication.h>
@@ -37,7 +37,7 @@
 #include <tqtextedit.h>
 #include <tqframe.h>
 #include <tqtimer.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>