From fd426b2aeb50a555b211a366b81deb2812eb2098 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:45:12 -0600 Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4 --- k9Mplayer/k9mplayer.cpp | 4 ++-- k9Mplayer/mplayer.cpp | 2 +- k9author/chapterEdit.cpp | 2 +- k9author/import.cpp | 2 +- k9author/k9avidecode.cpp | 2 +- k9author/k9import.cpp | 2 +- k9author/k9importfiles.cpp | 2 +- k9author/k9menuedit.cpp | 2 +- k9author/k9newdvd.cpp | 6 +++--- k9author/k9newtitle.cpp | 4 ++-- k9author/menuEdit.cpp | 2 +- k9author/newTitle.cpp | 2 +- k9decmpeg/k9plaympeg2.cpp | 2 +- libk9copy/backupdlg.cpp | 2 +- libk9copy/dvdprogress.cpp | 2 +- libk9copy/k9burndvd.cpp | 2 +- libk9copy/k9burndvd.h | 2 +- libk9copy/k9cellcopylist.cpp | 2 +- libk9copy/k9dvd.cpp | 2 +- libk9copy/k9dvdauthor.cpp | 4 ++-- libk9copy/k9dvdauthor.h | 4 ++-- libk9copy/k9dvdbackup.cpp | 4 ++-- libk9copy/k9mp4enc.cpp | 6 +++--- libk9copy/k9saveimage.h | 2 +- libk9copy/mp4dlg.cpp | 2 +- libk9copy/processList.cpp | 2 +- libk9copy/progress.cpp | 2 +- src/configDlg.cpp | 2 +- src/k9main.h | 2 +- src/k9mainw.cpp | 2 +- src/k9mencodercmdgen.cpp | 2 +- src/k9mp4title.cpp | 2 +- src/k9play.cpp | 2 +- src/k9prefdvd.cpp | 2 +- src/k9prefmencoder.cpp | 2 +- src/k9prefmpeg4.cpp | 2 +- src/k9prefpreview.cpp | 2 +- src/k9settings.cpp | 4 ++-- src/k9titlefactor.cpp | 2 +- src/kviewmpeg2.cpp | 2 +- src/langselectw.cpp | 2 +- src/main.cpp | 2 +- src/mencoderCmdGen.cpp | 2 +- src/playbackoptionsw.cpp | 2 +- src/prefAuthor.cpp | 2 +- src/prefDVD.cpp | 2 +- src/prefMPEG4.cpp | 2 +- src/prefMencoder.cpp | 2 +- src/prefpreview.cpp | 2 +- src/tdeconfigdlg.cpp | 2 +- src/titlefactor.cpp | 2 +- src/viewmpeg2.cpp | 2 +- 52 files changed, 62 insertions(+), 62 deletions(-) diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp index bcc06d4..f608390 100644 --- a/k9Mplayer/k9mplayer.cpp +++ b/k9Mplayer/k9mplayer.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include K9Mplayer::K9Mplayer(TQObject *parent,const char *name,const TQStringList args):MPlayer((TQWidget*)parent) { m_seeking=FALSE; diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp index c03e052..f7df15d 100644 --- a/k9Mplayer/mplayer.cpp +++ b/k9Mplayer/mplayer.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './mplayer.ui' ** diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp index fc28760..716c601 100644 --- a/k9author/chapterEdit.cpp +++ b/k9author/chapterEdit.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './chapterEdit.ui' ** diff --git a/k9author/import.cpp b/k9author/import.cpp index 189e46f..12481e0 100644 --- a/k9author/import.cpp +++ b/k9author/import.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './import.ui' ** diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp index 54a0356..ec7b82d 100644 --- a/k9author/k9avidecode.cpp +++ b/k9author/k9avidecode.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "ac.h" diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp index 02f2cba..d1abbeb 100644 --- a/k9author/k9import.cpp +++ b/k9author/k9import.cpp @@ -15,7 +15,7 @@ #include "k9title.h" #include "k9avifile.h" #include "k9lvitemimport.h" -#include +#include #include "k9menuedit.h" #include "k9haldevice.h" #include "k9config.h" diff --git a/k9author/k9importfiles.cpp b/k9author/k9importfiles.cpp index db746fc..e53fa86 100644 --- a/k9author/k9importfiles.cpp +++ b/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" diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp index 956c8a6..129b252 100644 --- a/k9author/k9menuedit.cpp +++ b/k9author/k9menuedit.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp index 2980929..c997340 100644 --- a/k9author/k9newdvd.cpp +++ b/k9author/k9newdvd.cpp @@ -17,11 +17,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include "k9menu.h" #include "k9menubutton.h" #include "k9processlist.h" diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp index 1882e9c..ae1eec5 100644 --- a/k9author/k9newtitle.cpp +++ b/k9author/k9newtitle.cpp @@ -17,11 +17,11 @@ #include #include #include -#include +#include #include "k9menu.h" #include "k9menubutton.h" #include "kpushbutton.h" -#include +#include #include k9NewTitle::k9NewTitle(TQWidget* parent, const char* name, WFlags fl) : newTitle(parent,name,fl) { diff --git a/k9author/menuEdit.cpp b/k9author/menuEdit.cpp index 52610c4..9b2bb2f 100644 --- a/k9author/menuEdit.cpp +++ b/k9author/menuEdit.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './menuEdit.ui' ** diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp index 57b4385..e8856f2 100644 --- a/k9author/newTitle.cpp +++ b/k9author/newTitle.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './newTitle.ui' ** diff --git a/k9decmpeg/k9plaympeg2.cpp b/k9decmpeg/k9plaympeg2.cpp index e18f4ae..db0c02e 100644 --- a/k9decmpeg/k9plaympeg2.cpp +++ b/k9decmpeg/k9plaympeg2.cpp @@ -13,7 +13,7 @@ #include "kdecmpeg2.h" #include "dvdnav.h" -#include +#include #include k9PlayMPEG2::k9PlayMPEG2() diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp index 6abc806..2236596 100644 --- a/libk9copy/backupdlg.cpp +++ b/libk9copy/backupdlg.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './backupdlg.ui' ** diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp index f211fe3..6eef7cc 100644 --- a/libk9copy/dvdprogress.cpp +++ b/libk9copy/dvdprogress.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './dvdprogress.ui' ** diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp index 45b8597..b30ee59 100644 --- a/libk9copy/k9burndvd.cpp +++ b/libk9copy/k9burndvd.cpp @@ -22,7 +22,7 @@ #include "k9burndvd.moc" #include "k9tools.h" #include -#include +#include #include #include #include diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h index 8476030..81f4aea 100644 --- a/libk9copy/k9burndvd.h +++ b/libk9copy/k9burndvd.h @@ -24,7 +24,7 @@ #include "k9progress.h" #include -#include +#include /** @author Jean-Michel PETIT diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp index fe880ac..c04ea0b 100644 --- a/libk9copy/k9cellcopylist.cpp +++ b/libk9copy/k9cellcopylist.cpp @@ -21,7 +21,7 @@ #include "k9dvdtitle.h" #include "k9ifo2.h" -#include +#include int k9CellVTSList::compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { k9CellCopyVTS * it1,*it2; diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp index 34bece4..9be2380 100755 --- a/libk9copy/k9dvd.cpp +++ b/libk9copy/k9dvd.cpp @@ -25,7 +25,7 @@ #include "k9dvdprogress.h" #include "k9ifo2.h" #include -#include +#include #include #include diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp index e050392..92693fd 100755 --- a/libk9copy/k9dvdauthor.cpp +++ b/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 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libk9copy/k9dvdauthor.h b/libk9copy/k9dvdauthor.h index b319ea0..98c46fb 100755 --- a/libk9copy/k9dvdauthor.h +++ b/libk9copy/k9dvdauthor.h @@ -28,8 +28,8 @@ #include "k9process.h" #include #include -#include -#include +#include +#include /** *@author */ diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp index fae27c1..83c04a6 100755 --- a/libk9copy/k9dvdbackup.cpp +++ b/libk9copy/k9dvdbackup.cpp @@ -24,7 +24,7 @@ #include "k9vamps.h" #include "ac.h" #include "k9dvdtitleset.h" -#include +#include #include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include "k9backupdlg.h" diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index a8a74b9..0c3480c 100644 --- a/libk9copy/k9mp4enc.cpp +++ b/libk9copy/k9mp4enc.cpp @@ -14,13 +14,13 @@ #include "k9config.h" #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include "k9tools.h" #include "k9audiocodecs.h" diff --git a/libk9copy/k9saveimage.h b/libk9copy/k9saveimage.h index ffe503d..494d0cf 100644 --- a/libk9copy/k9saveimage.h +++ b/libk9copy/k9saveimage.h @@ -18,7 +18,7 @@ #include #include "k9fifo.h" -#include +#include #include diff --git a/libk9copy/mp4dlg.cpp b/libk9copy/mp4dlg.cpp index 0527be2..236157f 100644 --- a/libk9copy/mp4dlg.cpp +++ b/libk9copy/mp4dlg.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './mp4dlg.ui' ** diff --git a/libk9copy/processList.cpp b/libk9copy/processList.cpp index 536c545..742c694 100644 --- a/libk9copy/processList.cpp +++ b/libk9copy/processList.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './processList.ui' ** diff --git a/libk9copy/progress.cpp b/libk9copy/progress.cpp index 7c18a9c..a47f292 100644 --- a/libk9copy/progress.cpp +++ b/libk9copy/progress.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './progress.ui' ** diff --git a/src/configDlg.cpp b/src/configDlg.cpp index e30229f..29d71f8 100644 --- a/src/configDlg.cpp +++ b/src/configDlg.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './configDlg.ui' ** diff --git a/src/k9main.h b/src/k9main.h index 4efaba4..0e9d6e5 100644 --- a/src/k9main.h +++ b/src/k9main.h @@ -19,7 +19,7 @@ #include "tdeconfigdlg.h" #include "k9playbackoptions.h" #include -#include +#include #include #include #include diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp index 575e1f9..61702d6 100644 --- a/src/k9mainw.cpp +++ b/src/k9mainw.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './k9mainw.ui' ** diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp index 877a745..656b00d 100644 --- a/src/k9mencodercmdgen.cpp +++ b/src/k9mencodercmdgen.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k9mp4title.cpp b/src/k9mp4title.cpp index 606e508..f9b5b09 100644 --- a/src/k9mp4title.cpp +++ b/src/k9mp4title.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k9play.cpp b/src/k9play.cpp index 36aaeb2..c21b561 100644 --- a/src/k9play.cpp +++ b/src/k9play.cpp @@ -24,7 +24,7 @@ #include #include #include "dvdread.h" -#include +#include #include void k9play::saveStatus(k9play_st _status) { diff --git a/src/k9prefdvd.cpp b/src/k9prefdvd.cpp index 03aca00..4f5cfad 100644 --- a/src/k9prefdvd.cpp +++ b/src/k9prefdvd.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include k9prefDVD::k9prefDVD(TQWidget* parent, const char* name, WFlags fl) : prefDVD(parent,name,fl) diff --git a/src/k9prefmencoder.cpp b/src/k9prefmencoder.cpp index 0bf4d21..c902ee0 100644 --- a/src/k9prefmencoder.cpp +++ b/src/k9prefmencoder.cpp @@ -17,7 +17,7 @@ #include "k9mencodercmdgen.h" #include #include -#include +#include k9prefMencoder::k9prefMencoder(TQWidget* parent, const char* name, WFlags fl) : prefMencoder(parent,name,fl) diff --git a/src/k9prefmpeg4.cpp b/src/k9prefmpeg4.cpp index d716ffe..16661d9 100644 --- a/src/k9prefmpeg4.cpp +++ b/src/k9prefmpeg4.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include k9prefMPEG4::k9prefMPEG4(TQWidget* parent, const char* name, WFlags fl) diff --git a/src/k9prefpreview.cpp b/src/k9prefpreview.cpp index bff816b..1989528 100644 --- a/src/k9prefpreview.cpp +++ b/src/k9prefpreview.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include k9prefPreview::k9prefPreview(TQWidget* parent, const char* name, WFlags fl) : prefPreview(parent,name,fl) diff --git a/src/k9settings.cpp b/src/k9settings.cpp index 84d07f5..e79c356 100644 --- a/src/k9settings.cpp +++ b/src/k9settings.cpp @@ -13,9 +13,9 @@ #include "k9settings.h" #include -#include +#include #include -#include +#include #include k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase (IconList,caption, diff --git a/src/k9titlefactor.cpp b/src/k9titlefactor.cpp index 0789de1..eac9041 100644 --- a/src/k9titlefactor.cpp +++ b/src/k9titlefactor.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp index af20c94..f7aa196 100755 --- a/src/kviewmpeg2.cpp +++ b/src/kviewmpeg2.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include "kviewmpeg2.h" #include "k9config.h" diff --git a/src/langselectw.cpp b/src/langselectw.cpp index 5dd31b9..7290693 100644 --- a/src/langselectw.cpp +++ b/src/langselectw.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './langselectw.ui' ** diff --git a/src/main.cpp b/src/main.cpp index 17302b7..cd0fd20 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "ac.h" #include "k9copy.h" #include "dvdread.h" diff --git a/src/mencoderCmdGen.cpp b/src/mencoderCmdGen.cpp index 14bf588..e93ff71 100644 --- a/src/mencoderCmdGen.cpp +++ b/src/mencoderCmdGen.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './mencoderCmdGen.ui' ** diff --git a/src/playbackoptionsw.cpp b/src/playbackoptionsw.cpp index 211676d..1c8f482 100644 --- a/src/playbackoptionsw.cpp +++ b/src/playbackoptionsw.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './playbackoptionsw.ui' ** diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp index 8f8c035..c28d732 100644 --- a/src/prefAuthor.cpp +++ b/src/prefAuthor.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './prefAuthor.ui' ** diff --git a/src/prefDVD.cpp b/src/prefDVD.cpp index 00be4af..827d875 100644 --- a/src/prefDVD.cpp +++ b/src/prefDVD.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './prefDVD.ui' ** diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp index 90c8f72..c31075e 100644 --- a/src/prefMPEG4.cpp +++ b/src/prefMPEG4.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './prefMPEG4.ui' ** diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp index 85f39ab..dacfb85 100644 --- a/src/prefMencoder.cpp +++ b/src/prefMencoder.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './prefMencoder.ui' ** diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp index 9f23a57..3cdc86d 100644 --- a/src/prefpreview.cpp +++ b/src/prefpreview.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './prefpreview.ui' ** diff --git a/src/tdeconfigdlg.cpp b/src/tdeconfigdlg.cpp index 3f001f5..f87df59 100644 --- a/src/tdeconfigdlg.cpp +++ b/src/tdeconfigdlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "tdeconfigdlg.h" -#include "kmessagebox.h" +#include "tdemessagebox.h" #include #include diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp index bfd8e9b..3e2d5ea 100644 --- a/src/titlefactor.cpp +++ b/src/titlefactor.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './titlefactor.ui' ** diff --git a/src/viewmpeg2.cpp b/src/viewmpeg2.cpp index 500dc06..db9419f 100644 --- a/src/viewmpeg2.cpp +++ b/src/viewmpeg2.cpp @@ -1,4 +1,4 @@ -#include +#include /**************************************************************************** ** Form implementation generated from reading ui file './viewmpeg2.ui' **