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

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

(limited to 'libk9copy')

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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <tqdir.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
 #include <kprocess.h>
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 <k9process.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
 @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 <kmessagebox.h>
+#include <tdemessagebox.h>
 
 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 <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/stat.h>
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 <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>
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 <tqdatastream.h>
 #include <tqprogressdialog.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 /**
   *@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 <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"
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 <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"
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 <tqdatetime.h>
 
 #include "k9fifo.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqimage.h>
 
 
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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** 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 <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './progress.ui'
 **
-- 
cgit v1.2.1