summaryrefslogtreecommitdiffstats
path: root/tdersync
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdersync
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdersync')
-rw-r--r--tdersync/CMakeLists.txt6
-rw-r--r--tdersync/rsyncconfigdialog.cpp2
-rw-r--r--tdersync/rsyncconfigdialog.h2
-rw-r--r--tdersync/tdersync.cpp4
-rw-r--r--tdersync/tdersync.h8
5 files changed, 11 insertions, 11 deletions
diff --git a/tdersync/CMakeLists.txt b/tdersync/CMakeLists.txt
index 20ea5b77..1ccc3220 100644
--- a/tdersync/CMakeLists.txt
+++ b/tdersync/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/tdefx
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
)
link_directories(
@@ -45,6 +45,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.1
- LINK tdeui-shared kio-shared
+ LINK tdeui-shared tdeio-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 0c1cd532..ac8d32fa 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -83,7 +83,7 @@
#include <kpassdlg.h>
#include <klistview.h>
#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kdirlister.h>
#include <kstandarddirs.h>
diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 3da9e6f7..2ce05b8d 100644
--- a/tdersync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -27,7 +27,7 @@
#include <kurl.h>
#include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
#include <klibloader.h>
#include <kdialogbase.h>
diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp
index 3e9e4998..d940fd7a 100644
--- a/tdersync/tdersync.cpp
+++ b/tdersync/tdersync.cpp
@@ -50,8 +50,8 @@
#include <util.h>
#endif
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
#include "tdersync.h"
#include "rsyncconfigdialog.h"
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index c0af479f..1e11cb95 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -24,11 +24,11 @@
#include <kurl.h>
#include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
#include <klibloader.h>
#include <tdeparts/plugin.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
#include <tqfile.h>
#include <tqtimer.h>
@@ -62,7 +62,7 @@
#include <kpassdlg.h>
#include <klistview.h>
#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kdirlister.h>
#include <kstandarddirs.h>