diff options
Diffstat (limited to 'kdoctools')
-rw-r--r-- | kdoctools/CMakeLists.txt | 16 | ||||
-rw-r--r-- | kdoctools/Makefile.am | 20 | ||||
-rw-r--r-- | kdoctools/ghelp.protocol | 2 | ||||
-rw-r--r-- | kdoctools/help.protocol | 2 | ||||
-rw-r--r-- | kdoctools/kio_help.upd | 3 | ||||
-rw-r--r-- | kdoctools/main.cpp | 6 | ||||
-rw-r--r-- | kdoctools/main_ghelp.cpp | 6 | ||||
-rw-r--r-- | kdoctools/meinproc.cpp | 2 | ||||
-rw-r--r-- | kdoctools/move_tdeio_help_cache.sh (renamed from kdoctools/move_kio_help_cache.sh) | 2 | ||||
-rw-r--r-- | kdoctools/tdeio_help.cpp (renamed from kdoctools/kio_help.cpp) | 6 | ||||
-rw-r--r-- | kdoctools/tdeio_help.h (renamed from kdoctools/kio_help.h) | 0 | ||||
-rw-r--r-- | kdoctools/tdeio_help.upd | 3 | ||||
-rw-r--r-- | kdoctools/xslt.cpp | 4 |
13 files changed, 36 insertions, 36 deletions
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt index 09b04a8ea..8657e277e 100644 --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt @@ -33,8 +33,8 @@ link_directories( ##### other data ################################ install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML DESTINATION ${BIN_INSTALL_DIR} ) -install( PROGRAMS move_kio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( FILES kio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( PROGRAMS move_tdeio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES tdeio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES help.protocol ghelp.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) # FIXME why automake version is so complicated? @@ -58,12 +58,12 @@ tde_add_library( kbzipfilter_dummy STATIC_PIC ) -#### kio_help ################################### +#### tdeio_help ################################### -set( target kio_help ) +set( target tdeio_help ) set( ${target}_SRCS - kio_help.cpp main.cpp xslt.cpp + tdeio_help.cpp main.cpp xslt.cpp ) tde_add_kpart( ${target} SHARED @@ -73,12 +73,12 @@ tde_add_kpart( ${target} SHARED ) -#### kio_ghelp ################################### +#### tdeio_ghelp ################################### -set( target kio_ghelp ) +set( target tdeio_ghelp ) set( ${target}_SRCS - kio_help.cpp main_ghelp.cpp xslt.cpp + tdeio_help.cpp main_ghelp.cpp xslt.cpp ) tde_add_kpart( ${target} SHARED diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am index 05c3487cd..c009fd19d 100644 --- a/kdoctools/Makefile.am +++ b/kdoctools/Makefile.am @@ -8,17 +8,17 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp ####### Files -kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la +kde_module_LTLIBRARIES = tdeio_help.la tdeio_ghelp.la -kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp -kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE) -kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_help_la_SOURCES = tdeio_help.cpp main.cpp xslt.cpp +tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE) +tdeio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp -kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE) -kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_ghelp_la_SOURCES = tdeio_help.cpp main_ghelp.cpp xslt.cpp +tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE) +tdeio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -noinst_HEADERS = kio_help.h +noinst_HEADERS = tdeio_help.h kdelnk_DATA = help.protocol ghelp.protocol kdelnkdir = $(kde_servicesdir) @@ -36,8 +36,8 @@ bin_SCRIPTS = checkXML METASOURCES = AUTO -update_DATA = kio_help.upd -update_SCRIPTS = move_kio_help_cache.sh +update_DATA = tdeio_help.upd +update_SCRIPTS = move_tdeio_help_cache.sh updatedir = $(kde_datadir)/tdeconf_update messages: diff --git a/kdoctools/ghelp.protocol b/kdoctools/ghelp.protocol index ec5e50a34..f8dca77c2 100644 --- a/kdoctools/ghelp.protocol +++ b/kdoctools/ghelp.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_ghelp +exec=tdeio_ghelp protocol=ghelp input=none output=filesystem diff --git a/kdoctools/help.protocol b/kdoctools/help.protocol index b4ee178e6..dc7a25b16 100644 --- a/kdoctools/help.protocol +++ b/kdoctools/help.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_help +exec=tdeio_help protocol=help input=none output=filesystem diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd deleted file mode 100644 index cca96f64b..000000000 --- a/kdoctools/kio_help.upd +++ /dev/null @@ -1,3 +0,0 @@ -# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help -Id=trinity_2 -Script=move_kio_help_cache.sh,sh diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp index 7ba294bfb..57a44156c 100644 --- a/kdoctools/main.cpp +++ b/kdoctools/main.cpp @@ -16,7 +16,7 @@ #include <kinstance.h> #include <kdebug.h> #include <stdlib.h> -#include "kio_help.h" +#include "tdeio_help.h" #include <xslt.h> extern int xmlLoadExtDtdDefaultValue; @@ -25,7 +25,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - TDEInstance instance( "kio_help" ); + TDEInstance instance( "tdeio_help" ); fillInstance(instance); (void)instance.config(); // we need this one to make sure system globals are read @@ -33,7 +33,7 @@ extern "C" if (argc != 4) { - fprintf(stderr, "Usage: kio_help protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_help protocol domain-socket1 domain-socket2\n"); exit(-1); } diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp index bbdb5d7c0..94bcc60dd 100644 --- a/kdoctools/main_ghelp.cpp +++ b/kdoctools/main_ghelp.cpp @@ -16,7 +16,7 @@ #include <kinstance.h> #include <kdebug.h> #include <stdlib.h> -#include "kio_help.h" +#include "tdeio_help.h" #include <xslt.h> extern int xmlLoadExtDtdDefaultValue; @@ -25,7 +25,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - TDEInstance instance( "kio_ghelp" ); + TDEInstance instance( "tdeio_ghelp" ); fillInstance(instance); (void)instance.config(); // we need this one to make sure system globals are read @@ -33,7 +33,7 @@ extern "C" if (argc != 4) { - fprintf(stderr, "Usage: kio_ghelp protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_ghelp protocol domain-socket1 domain-socket2\n"); exit(-1); } diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 1c47ec43f..034218546 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -98,7 +98,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KLocale::setMainCatalogue("kio_help"); + KLocale::setMainCatalogue("tdeio_help"); TDEInstance ins("meinproc"); TDEGlobal::locale(); diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_tdeio_help_cache.sh index f1342c5b4..33096e885 100644 --- a/kdoctools/move_kio_help_cache.sh +++ b/kdoctools/move_tdeio_help_cache.sh @@ -1,6 +1,6 @@ #!/bin/sh bas=`tde-config --localprefix`share/apps/tdeio_help -mv "$bas/cache" "`tde-config --path cache`kio_help" +mv "$bas/cache" "`tde-config --path cache`tdeio_help" rmdir "$bas" exit 0 diff --git a/kdoctools/kio_help.cpp b/kdoctools/tdeio_help.cpp index 19712f826..d6d5f285a 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/tdeio_help.cpp @@ -30,7 +30,7 @@ #include <kstandarddirs.h> #include <kinstance.h> -#include "kio_help.h" +#include "tdeio_help.h" #include <libxslt/xsltutils.h> #include <libxslt/transform.h> #include "xslt.h" @@ -240,7 +240,7 @@ void HelpProtocol::get( const KURL& url ) infoMessage( i18n( "Saving to cache" ) ); TQString cache = file.left( file.length() - 7 ); saveToCache( mParsed, locateLocal( "cache", - "kio_help" + cache + + "tdeio_help" + cache + "cache.bz2" ) ); } } else infoMessage( i18n( "Using cached version" ) ); @@ -333,7 +333,7 @@ void HelpProtocol::mimetype( const KURL &) finished(); } -// Copied from kio_file to avoid redirects +// Copied from tdeio_file to avoid redirects #define MAX_IPC_SIZE (1024*32) diff --git a/kdoctools/kio_help.h b/kdoctools/tdeio_help.h index df002df15..df002df15 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/tdeio_help.h diff --git a/kdoctools/tdeio_help.upd b/kdoctools/tdeio_help.upd new file mode 100644 index 000000000..4be705f6e --- /dev/null +++ b/kdoctools/tdeio_help.upd @@ -0,0 +1,3 @@ +# Move tdeio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help +Id=trinity_2 +Script=move_tdeio_help_cache.sh,sh diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 6653c7cd5..d143e0a06 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -11,7 +11,7 @@ #include <tqregexp.h> #include <xslt.h> #include <kinstance.h> -#include "kio_help.h" +#include "tdeio_help.h" #include <klocale.h> #include <assert.h> #include <kfilterbase.h> @@ -287,7 +287,7 @@ TQString lookForCache( const TQString &filename ) return output; if ( readCache( filename, locateLocal( "cache", - "kio_help" + cache + + "tdeio_help" + cache + "cache.bz2" ), output ) ) return output; |