summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:53:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:53:13 -0600
commitef9eb4959e8e2df853a8dcdf31a21b525fd42808 (patch)
tree21de67543a92a816b308e12c7cfc30699cc56caf /src
parent2ec1b629e4a1e15db7d1563f6c5db1c307aa9ea7 (diff)
downloadtdeio-locate-ef9eb4959e8e2df853a8dcdf31a21b525fd42808.tar.gz
tdeio-locate-ef9eb4959e8e2df853a8dcdf31a21b525fd42808.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/kio_locate.cpp4
-rw-r--r--src/kio_locate.h6
-rw-r--r--src/klocateconfig.kcfgc2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2a1ab8..0ac1254 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
)
link_directories(
@@ -42,6 +42,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/src/kio_locate.cpp b/src/kio_locate.cpp
index 38317bb..9f39be8 100644
--- a/src/kio_locate.cpp
+++ b/src/kio_locate.cpp
@@ -30,7 +30,7 @@
#include <grp.h>
#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kdebug.h>
#include <kde_file.h>
#include <kiconloader.h>
@@ -836,7 +836,7 @@ bool LocateProtocol::isHelpRequest()
void LocateProtocol::helpRequest()
{
// Redirect the user to our help documents.
- redirection("help:/kio-locate/");
+ redirection("help:/tdeio-locate/");
finished();
}
diff --git a/src/kio_locate.h b/src/kio_locate.h
index d02fdd9..13097cd 100644
--- a/src/kio_locate.h
+++ b/src/kio_locate.h
@@ -65,8 +65,8 @@
#include <tqdict.h>
#include <tqvaluelist.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
#include "locater.h"
#include "pattern.h"
@@ -88,7 +88,7 @@ enum LocateCollapsedIcon { iconBlue, iconGreen, iconGrey, iconOrange, iconRed, i
/**
- * Implementation of the kioslave for the locate protocol.
+ * Implementation of the tdeioslave for the locate protocol.
*
* Enables you to enter "locate:pattern" wherever an URL can be used
* in KDE.
diff --git a/src/klocateconfig.kcfgc b/src/klocateconfig.kcfgc
index 453e65f..270779c 100644
--- a/src/klocateconfig.kcfgc
+++ b/src/klocateconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=kio_locate.kcfg
ClassName=KLocateConfig
Singleton=true