From 82d47ff1c4f0fb984865a4f377fe689db215c7db Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:41:02 -0600 Subject: [PATCH] Fix a few remaining references to kio_ --- doc/en/index.docbook | 4 ++-- po/fr/kio-locate.po | 4 ++-- po/messages.sh | 4 ++-- src/CMakeLists.txt | 6 +++--- src/klocateconfig.kcfgc | 2 +- src/locate.protocol | 2 +- src/locater.protocol | 2 +- src/rlocate.protocol | 2 +- src/tdeio_locate.cpp | 14 +++++++------- src/tdeio_locate.h | 4 ++-- src/tdeio_locate.kcfg | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 19b81e7..e3b93be 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -77,12 +77,12 @@ KDE kio-locate -kio_locate +tdeio_locate kiolocate locate slocate kio-slave -kio_slave +tdeio_slave tdeioslave search diff --git a/po/fr/kio-locate.po b/po/fr/kio-locate.po index 64ec458..6257c22 100644 --- a/po/fr/kio-locate.po +++ b/po/fr/kio-locate.po @@ -1,4 +1,4 @@ -# translation of kio_locate.po to French +# translation of tdeio_locate.po to French # kio-locate: KDE I/O Slave for the locate command # # Copyright (C) 2004 by Armin Straub @@ -8,7 +8,7 @@ # Laurent Rathle , 2004. msgid "" msgstr "" -"Project-Id-Version: kio_locate\n" +"Project-Id-Version: tdeio_locate\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-09-15 10:08+0200\n" "PO-Revision-Date: 2004-10-21 16:52+0200\n" diff --git a/po/messages.sh b/po/messages.sh index 9c9419b..abec01b 100755 --- a/po/messages.sh +++ b/po/messages.sh @@ -49,7 +49,7 @@ done 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 +$XGETTEXT `find $SRCDIR -name "*.cpp"` -o tdeio_locate.pot ## bad hack to get strings from *.ui files rm -rf "$TMPHACK" @@ -62,7 +62,7 @@ rm -f $SRCDIR/_translatorinfo.cpp echo "merging the .po files" for i in `ls *.po`; do - msgmerge $i kio_locate.pot -o $i || exit 1 + msgmerge $i tdeio_locate.pot -o $i || exit 1 done ## finished diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0ac1254..0e58011 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,13 +31,13 @@ install( FILES rlocate.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES locate.desktop DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders ) -##### kio_locate ############################## +##### tdeio_locate ############################## -set( target kio_locate ) +set( target tdeio_locate ) set( ${target}_SRCS klocateconfig.kcfgc klocateconfigwidget.ui klocateconfigfilterwidget.ui - klocateconfiglocatewidget.ui kio_locate.cpp locater.cpp pattern.cpp + klocateconfiglocatewidget.ui tdeio_locate.cpp locater.cpp pattern.cpp ) tde_add_kpart( ${target} AUTOMOC diff --git a/src/klocateconfig.kcfgc b/src/klocateconfig.kcfgc index 270779c..4e860df 100644 --- a/src/klocateconfig.kcfgc +++ b/src/klocateconfig.kcfgc @@ -1,5 +1,5 @@ # Code generation options for tdeconfig_compiler -File=kio_locate.kcfg +File=tdeio_locate.kcfg ClassName=KLocateConfig Singleton=true Mutators=true diff --git a/src/locate.protocol b/src/locate.protocol index 61e4810..5fc528b 100644 --- a/src/locate.protocol +++ b/src/locate.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_locate +exec=tdeio_locate protocol=locate input=none output=filesystem diff --git a/src/locater.protocol b/src/locater.protocol index b40c6a2..3e742b8 100644 --- a/src/locater.protocol +++ b/src/locater.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_locate +exec=tdeio_locate protocol=locater input=none output=filesystem diff --git a/src/rlocate.protocol b/src/rlocate.protocol index a994b32..a49daf9 100644 --- a/src/rlocate.protocol +++ b/src/rlocate.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_locate +exec=tdeio_locate protocol=rlocate input=none output=filesystem diff --git a/src/tdeio_locate.cpp b/src/tdeio_locate.cpp index 9f39be8..b06ab90 100644 --- a/src/tdeio_locate.cpp +++ b/src/tdeio_locate.cpp @@ -39,7 +39,7 @@ #include #include -#include "kio_locate.h" +#include "tdeio_locate.h" #include "klocateconfig.h" #include "klocateconfigwidget.h" #include "klocateconfigfilterwidget.h" @@ -264,7 +264,7 @@ static const UDSEntry pathToUDSEntry(const TQString& path, const TQString& displ // INITIALIZATION LocateProtocol::LocateProtocol(const TQCString &pool_socket, const TQCString &app_socket) - : SlaveBase("kio_locate", pool_socket, app_socket) + : SlaveBase("tdeio_locate", pool_socket, app_socket) { DEBUGSTR << "LocateProtocol::LocateProtocol()" << endl; @@ -1015,22 +1015,22 @@ extern "C" { // We use TDEApplication instead of TDEInstance here, because we use a // config dialog and such gui stuff. - TDEApplication app(argc, argv, "kio_locate", false, true); + TDEApplication app(argc, argv, "tdeio_locate", false, true); - DEBUGSTR << "*** Starting kio_locate " << endl; + DEBUGSTR << "*** Starting tdeio_locate " << endl; if (argc != 4) { - DEBUGSTR << "Usage: kio_locate protocol domain-socket1 domain-socket2" << endl; + DEBUGSTR << "Usage: tdeio_locate protocol domain-socket1 domain-socket2" << endl; exit(-1); } LocateProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); - DEBUGSTR << "*** kio_locate Done" << endl; + DEBUGSTR << "*** tdeio_locate Done" << endl; return 0; } } -#include "kio_locate.moc" +#include "tdeio_locate.moc" diff --git a/src/tdeio_locate.h b/src/tdeio_locate.h index 13097cd..926e7f4 100644 --- a/src/tdeio_locate.h +++ b/src/tdeio_locate.h @@ -56,8 +56,8 @@ * of course). */ -#ifndef _kio_locate_H_ -#define _kio_locate_H_ +#ifndef _tdeio_locate_H_ +#define _tdeio_locate_H_ #include #include diff --git a/src/tdeio_locate.kcfg b/src/tdeio_locate.kcfg index e0fdddc..f0525e7 100644 --- a/src/tdeio_locate.kcfg +++ b/src/tdeio_locate.kcfg @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - + klocale.h