Rename a number of libraries and executables to avoid conflicts with KDE4

INSTALL

@@ -2,8 +2,8 @@ This package requires CMake and tdelibs to build
 
 ==================== BUILDING ====================
 
-mkdir /tmp/kio-locate
-cd /tmp/kio-locate
+mkdir /tmp/tdeio-locate
+cd /tmp/tdeio-locate
 
 cmake <this source directory> \
   -DCMAKE_INSTALL_PREFIX=/opt/trinity \

admin/detect_uds_hidden.diff

@@ -8,7 +8,7 @@ diff -ur bksys-1.5.1.pre4/admin/kde.py kio-locate/admin/kde.py
  
 +	## check if KDE has the UDS_HIDDEN patch
 +	print "Checking KDE for UDS_HIDDEN       : ",
-+	if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read():
++	if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read():
 +		env['HAVE_UDS_HIDDEN']='1'
 +		p('GREEN', 'yes')
 +	else:

admin/kde.py

@@ -248,7 +248,7 @@ def detect_kde(env):
 
 	## check if KDE has the UDS_HIDDEN patch
 	print "Checking KDE for UDS_HIDDEN       : ",
-	if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read():
+	if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read():
 		env['HAVE_UDS_HIDDEN']='1'
 		p('GREEN', 'yes')
 	else:

doc/en/index.docbook

@@ -83,7 +83,7 @@
 <keyword>slocate</keyword>
 <keyword>kio-slave</keyword>
 <keyword>kio_slave</keyword>
-<keyword>kioslave</keyword>
+<keyword>tdeioslave</keyword>
 <keyword>search</keyword>
 </keywordset>
 

po/de/kio-locate.po

@@ -18,35 +18,35 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../src/kio_locate.cpp:499
+#: ../src/tdeio_locate.cpp:499
 msgid "Locating %1 ..."
 msgstr "Suche %1 ..."
 
-#: ../src/kio_locate.cpp:614
+#: ../src/tdeio_locate.cpp:614
 msgid "Finished."
 msgstr "Suche abgeschlossen."
 
-#: ../src/kio_locate.cpp:752
+#: ../src/tdeio_locate.cpp:752
 msgid "Configure - kio-locate"
 msgstr "Einstellungen - kio-locate"
 
-#: ../src/kio_locate.cpp:755
+#: ../src/tdeio_locate.cpp:755
 msgid "General"
 msgstr "Allgemeines"
 
-#: ../src/kio_locate.cpp:756
+#: ../src/tdeio_locate.cpp:756
 msgid "Filters"
 msgstr "Filter"
 
-#: ../src/kio_locate.cpp:757
+#: ../src/tdeio_locate.cpp:757
 msgid "Locate"
 msgstr "Locate"
 
-#: ../src/kio_locate.cpp:778
+#: ../src/tdeio_locate.cpp:778
 msgid "Configuration succesfully updated."
 msgstr "Einstellungen wurden übernommen."
 
-#: ../src/kio_locate.cpp:780
+#: ../src/tdeio_locate.cpp:780
 msgid "Configuration unchanged."
 msgstr "Einstellungen unverändert."
 

po/fr/kio-locate.po

@@ -19,35 +19,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: ../src/kio_locate.cpp:499
+#: ../src/tdeio_locate.cpp:499
 msgid "Locating %1 ..."
 msgstr "Recherche de %1 en cours ..."
 
-#: ../src/kio_locate.cpp:614
+#: ../src/tdeio_locate.cpp:614
 msgid "Finished."
 msgstr "Terminé."
 
-#: ../src/kio_locate.cpp:752
+#: ../src/tdeio_locate.cpp:752
 msgid "Configure - kio-locate"
 msgstr ""
 
-#: ../src/kio_locate.cpp:755
+#: ../src/tdeio_locate.cpp:755
 msgid "General"
 msgstr ""
 
-#: ../src/kio_locate.cpp:756
+#: ../src/tdeio_locate.cpp:756
 msgid "Filters"
 msgstr ""
 
-#: ../src/kio_locate.cpp:757
+#: ../src/tdeio_locate.cpp:757
 msgid "Locate"
 msgstr ""
 
-#: ../src/kio_locate.cpp:778
+#: ../src/tdeio_locate.cpp:778
 msgid "Configuration succesfully updated."
 msgstr ""
 
-#: ../src/kio_locate.cpp:780
+#: ../src/tdeio_locate.cpp:780
 msgid "Configuration unchanged."
 msgstr ""
 

po/kio_locate.pot

@@ -16,35 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/kio_locate.cpp:499
+#: ../src/tdeio_locate.cpp:499
 msgid "Locating %1 ..."
 msgstr ""
 
-#: ../src/kio_locate.cpp:614
+#: ../src/tdeio_locate.cpp:614
 msgid "Finished."
 msgstr ""
 
-#: ../src/kio_locate.cpp:752
+#: ../src/tdeio_locate.cpp:752
 msgid "Configure - kio-locate"
 msgstr ""
 
-#: ../src/kio_locate.cpp:755
+#: ../src/tdeio_locate.cpp:755
 msgid "General"
 msgstr ""
 
-#: ../src/kio_locate.cpp:756
+#: ../src/tdeio_locate.cpp:756
 msgid "Filters"
 msgstr ""
 
-#: ../src/kio_locate.cpp:757
+#: ../src/tdeio_locate.cpp:757
 msgid "Locate"
 msgstr ""
 
-#: ../src/kio_locate.cpp:778
+#: ../src/tdeio_locate.cpp:778
 msgid "Configuration succesfully updated."
 msgstr ""
 
-#: ../src/kio_locate.cpp:780
+#: ../src/tdeio_locate.cpp:780
 msgid "Configuration unchanged."
 msgstr ""
 

po/messages.sh

@@ -46,7 +46,7 @@ for F in "$SRCDIR/"*.ui; do
     FN=$TMPHACK/$(basename "$F")
     $UIC "$F" > "$FN.h" && $UIC -impl "$FN.h" "$F" > "$FN.cpp"
 done
-kconfig_compiler -d $TMPHACK $SRCDIR/*.kcfg $SRCDIR/*.kcfgc
+tdeconfig_compiler -d $TMPHACK $SRCDIR/*.kcfg $SRCDIR/*.kcfgc
 ## bad hack to get strings from *.ui files
 
 $XGETTEXT `find $SRCDIR -name "*.cpp"` -o kio_locate.pot

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}
 )

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();
 }
 

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.

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