Rename additional header files to avoid conflicts with KDE4

k9Mplayer/k9mplayer.cpp

@@ -15,8 +15,8 @@
 #include <tqtimer.h>
 #include <tqapplication.h>
 #include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 K9Mplayer::K9Mplayer(TQObject  *parent,const char *name,const TQStringList args):MPlayer((TQWidget*)parent) {
     m_seeking=FALSE;

k9Mplayer/mplayer.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './mplayer.ui'
 **

k9author/chapterEdit.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './chapterEdit.ui'
 **

k9author/import.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './import.ui'
 **

k9author/k9avidecode.cpp

@@ -28,7 +28,7 @@
 
 #include <tqimage.h>
 #include <dlfcn.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <cstdlib>
 #include "ac.h"
 

k9author/k9import.cpp

@@ -15,7 +15,7 @@
 #include "k9title.h"
 #include "k9avifile.h"
 #include "k9lvitemimport.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "k9menuedit.h"
 #include "k9haldevice.h"
 #include "k9config.h"

k9author/k9importfiles.cpp

@@ -12,7 +12,7 @@
 #include "k9importfiles.h"
 #include "k9import.h"
 #include "k9newtitle.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdeapplication.h"
 #include "k9chapteredit.h"
 #include "k9avifile.h"

k9author/k9menuedit.cpp

@@ -23,7 +23,7 @@
 #include <kurlrequester.h>
 #include <kcolorbutton.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <kiconloader.h>
 

k9author/k9newdvd.cpp

@@ -17,11 +17,11 @@
 #include <tqtextstream.h>
 #include <kstandarddirs.h>
 #include <tqapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqimage.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "k9menu.h"
 #include "k9menubutton.h"
 #include "k9processlist.h"

k9author/k9newtitle.cpp

@@ -17,11 +17,11 @@
 #include <knuminput.h>
 #include <ktimewidget.h>
 #include <k9avidecode.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "k9menu.h"
 #include "k9menubutton.h"
 #include "kpushbutton.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 k9NewTitle::k9NewTitle(TQWidget* parent, const char* name, WFlags fl)
         : newTitle(parent,name,fl) {

k9author/menuEdit.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './menuEdit.ui'
 **

k9author/newTitle.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './newTitle.ui'
 **

k9decmpeg/k9plaympeg2.cpp

@@ -13,7 +13,7 @@
 #include "kdecmpeg2.h"
 #include "dvdnav.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 
 k9PlayMPEG2::k9PlayMPEG2()

libk9copy/backupdlg.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './backupdlg.ui'
 **

libk9copy/dvdprogress.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './dvdprogress.ui'
 **

libk9copy/k9burndvd.cpp

@@ -22,7 +22,7 @@
 #include "k9burndvd.moc"
 #include "k9tools.h"
 #include <tqdir.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
 #include <kprocess.h>

libk9copy/k9burndvd.h

@@ -24,7 +24,7 @@
 #include "k9progress.h"
 
 #include <k9process.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
 @author Jean-Michel PETIT

libk9copy/k9cellcopylist.cpp

@@ -21,7 +21,7 @@
 #include "k9dvdtitle.h"
 #include "k9ifo2.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 int k9CellVTSList::compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) {
     k9CellCopyVTS * it1,*it2;

libk9copy/k9dvd.cpp

@@ -25,7 +25,7 @@
 #include "k9dvdprogress.h"
 #include "k9ifo2.h"
 #include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/stat.h>

libk9copy/k9dvdauthor.cpp

@@ -20,7 +20,7 @@
 #include "k9dvdauthor.h"
 #include "k9dvdtitle.h"
 #include "k9dvdbackup.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 #include "k9tools.h"
 
 #include <sys/types.h>
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqprogressdialog.h>
 #include <signal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvaluelist.h>
 #include <kstandarddirs.h>
 #include <tqapplication.h>

libk9copy/k9dvdauthor.h

@@ -28,8 +28,8 @@
 #include "k9process.h"
 #include <tqdatastream.h>
 #include <tqprogressdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 /**
   *@author
   */

libk9copy/k9dvdbackup.cpp

@@ -24,7 +24,7 @@
 #include "k9vamps.h"
 #include "ac.h"
 #include "k9dvdtitleset.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tqapplication.h>
 #include <tqfileinfo.h>
@@ -34,7 +34,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <string.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <kstandarddirs.h>
 #include "k9backupdlg.h"

libk9copy/k9mp4enc.cpp

@@ -14,13 +14,13 @@
 #include "k9config.h"
 #include <tqcstring.h>
 #include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqstringlist.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include "k9tools.h"
 #include "k9audiocodecs.h"

libk9copy/k9saveimage.h

@@ -18,7 +18,7 @@
 #include <tqdatetime.h>
 
 #include "k9fifo.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqimage.h>
 
 

libk9copy/mp4dlg.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './mp4dlg.ui'
 **

libk9copy/processList.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './processList.ui'
 **

libk9copy/progress.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './progress.ui'
 **

src/configDlg.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './configDlg.ui'
 **

src/k9main.h

@@ -19,7 +19,7 @@
 #include "tdeconfigdlg.h"
 #include "k9playbackoptions.h"
 #include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlistview.h>
 #include <tdemainwindow.h>
 #include <tdeaboutdata.h>

src/k9mainw.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './k9mainw.ui'
 **

src/k9mencodercmdgen.cpp

@@ -22,7 +22,7 @@
 #include <tqcombobox.h>
 #include <tqframe.h>
 #include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqvbox.h>

src/k9mp4title.cpp

@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqframe.h>
 #include <tqtabwidget.h>

src/k9play.cpp

@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "dvdread.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 void k9play::saveStatus(k9play_st _status) {

src/k9prefdvd.cpp

@@ -17,7 +17,7 @@
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 k9prefDVD::k9prefDVD(TQWidget* parent, const char* name, WFlags fl)
 : prefDVD(parent,name,fl)

src/k9prefmencoder.cpp

@@ -17,7 +17,7 @@
 #include "k9mencodercmdgen.h"
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 k9prefMencoder::k9prefMencoder(TQWidget* parent, const char* name, WFlags fl)
 : prefMencoder(parent,name,fl)

src/k9prefmpeg4.cpp

@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 
 k9prefMPEG4::k9prefMPEG4(TQWidget* parent, const char* name, WFlags fl)

src/k9prefpreview.cpp

@@ -17,7 +17,7 @@
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 k9prefPreview::k9prefPreview(TQWidget* parent, const char* name, WFlags fl)
 : prefPreview(parent,name,fl)

src/k9settings.cpp

@@ -13,9 +13,9 @@
 #include "k9settings.h"
 
 #include <tqframe.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 
 k9settings::k9settings(TQWidget *parent,const TQString &caption):  KDialogBase (IconList,caption,

src/k9titlefactor.cpp

@@ -18,7 +18,7 @@
 #include <tqslider.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

src/kviewmpeg2.cpp

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include "kviewmpeg2.h"
 #include "k9config.h"

src/langselectw.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './langselectw.ui'
 **

src/main.cpp

@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ac.h"
 #include "k9copy.h"
 #include "dvdread.h"

src/mencoderCmdGen.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './mencoderCmdGen.ui'
 **

src/playbackoptionsw.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './playbackoptionsw.ui'
 **

src/prefAuthor.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefAuthor.ui'
 **

src/prefDVD.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefDVD.ui'
 **

src/prefMPEG4.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefMPEG4.ui'
 **

src/prefMencoder.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefMencoder.ui'
 **

src/prefpreview.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefpreview.ui'
 **

src/tdeconfigdlg.cpp

@@ -19,7 +19,7 @@
 ***************************************************************************/
 
 #include "tdeconfigdlg.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 
 #include <kiconloader.h>
 #include <kpushbutton.h>

src/titlefactor.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './titlefactor.ui'
 **

src/viewmpeg2.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './viewmpeg2.ui'
 **