From fd426b2aeb50a555b211a366b81deb2812eb2098 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:45:12 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 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 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'src')

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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlistview.h>
 #include <tdemainwindow.h>
 #include <tdeaboutdata.h>
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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <tqcombobox.h>
 #include <tqframe.h>
 #include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
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 <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqframe.h>
 #include <tqtabwidget.h>
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 <sys/stat.h>
 #include <fcntl.h>
 #include "dvdread.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 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 <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)
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 <kpushbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 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 <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)
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 <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)
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 <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,
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 <tqslider.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
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 <stdlib.h>
 #include <unistd.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <kiconloader.h>
 #include <kpushbutton.h>
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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './viewmpeg2.ui'
 **
-- 
cgit v1.2.3