summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/mixedcd
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:52:05 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:52:05 -0600
commitd796716f1dc9dd0b198863d974a03bf356f636e6 (patch)
tree1bab87345ab25163397b8033b7e1910360bd94fb /libk3b/projects/mixedcd
parent6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff)
downloadk3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz
k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/projects/mixedcd')
-rw-r--r--libk3b/projects/mixedcd/k3bmixeddoc.cpp2
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
index 07e1fcf..39334c7 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
@@ -25,7 +25,7 @@
#include <tqdom.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kmessagebox.h>
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index bcbe019..885aa92 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -50,8 +50,8 @@
#include <kdebug.h>
#include <klocale.h>
#include <ktempfile.h>
-#include <kio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/global.h>
#include <kstringhandler.h>