summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /arts
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'arts')
-rw-r--r--arts/kde/CMakeLists.txt6
-rw-r--r--arts/kde/kioinputstream_impl.cpp6
-rw-r--r--arts/kde/kioinputstream_impl.h2
-rw-r--r--arts/kde/kplayobjectcreator.cc2
-rw-r--r--arts/kde/kplayobjectfactory.cc4
-rw-r--r--arts/knotify/knotify.cpp2
6 files changed, 11 insertions, 11 deletions
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 3877ddb9d..3b585256d 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
)
link_directories(
@@ -65,6 +65,6 @@ add_custom_command(
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.2.0
- LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
+ LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 4ff509980..bf6b3654a 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -31,9 +31,9 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <kio/job.h>
-#include <kio/kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/jobclasses.h>
#include <tqtimer.h>
#include <tqdatastream.h>
#include "artsversion.h"
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index d0a872881..1d18f6421 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
#include <tqcstring.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
#include <kurl.h>
#include "artskde.h"
#include "stdsynthmodule.h"
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc
index 2e8187e67..039c8a3bc 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cc
@@ -19,7 +19,7 @@
*/
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
#include "artskde.h"
#include "kplayobjectcreator.h"
#include "kplayobjectcreator.moc"
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index db4110792..fa9e2c5a1 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -19,7 +19,7 @@
*/
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
#include "kplayobject.h"
#include "artskde.h"
#include "kplayobjectfactory.h"
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include "kaudiomanagerplay.h"
#include <flowsystem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
using namespace std;
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index b8c1642f9..71006c1a7 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -50,7 +50,7 @@
#include <kartsserver.h>
#endif
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>