From d796716f1dc9dd0b198863d974a03bf356f636e6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:05 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 libk3b/projects/videocd/k3bvcddoc.cpp     | 4 ++--
 libk3b/projects/videocd/k3bvcdjob.cpp     | 4 ++--
 libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +-
 libk3b/projects/videocd/k3bvcdtrack.cpp   | 2 +-
 libk3b/projects/videocd/k3bvcdtrack.h     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libk3b/projects/videocd')

diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index d28e942..2c5da16 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -28,10 +28,10 @@
 #include <kurl.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
 
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 7b2d4ff..e4ea8ee 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -14,11 +14,11 @@
 */
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <ktempfile.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqstring.h>
 #include <tqdatetime.h>
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index f963be8..e19e622 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -15,7 +15,7 @@
 
 // Kde Includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <k3bcore.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index 59d6387..0f458b6 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -14,7 +14,7 @@
 */
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstring.h>
 #include <tqfileinfo.h>
diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h
index f36eb8c..f529275 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.h
+++ b/libk3b/projects/videocd/k3bvcdtrack.h
@@ -23,7 +23,7 @@
 #include <tqptrlist.h>
 
 // Kde Includes
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 // K3b Includes
 #include "mpeginfo/k3bmpeginfo.h"
-- 
cgit v1.2.3