From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kdoctools/meinproc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 1600e628f..8f9b94350 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -95,15 +95,15 @@ int main(int argc, char **argv) { "$Revision$", I18N_NOOP("TDE Translator for XML")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KLocale::setMainCatalogue("kio_help"); KInstance ins("meinproc"); KGlobal::locale(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) { args->usage(); return ( 1 ); -- cgit v1.2.1 From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kdoctools/main.cpp | 2 +- kdoctools/main_ghelp.cpp | 2 +- kdoctools/meinproc.cpp | 4 ++-- kdoctools/xslt.cpp | 2 +- kdoctools/xslt.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp index 8e096d6cf..7ba294bfb 100644 --- a/kdoctools/main.cpp +++ b/kdoctools/main.cpp @@ -25,7 +25,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - KInstance instance( "kio_help" ); + TDEInstance instance( "kio_help" ); fillInstance(instance); (void)instance.config(); // we need this one to make sure system globals are read diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp index 281b31f17..bbdb5d7c0 100644 --- a/kdoctools/main_ghelp.cpp +++ b/kdoctools/main_ghelp.cpp @@ -25,7 +25,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - KInstance instance( "kio_ghelp" ); + TDEInstance instance( "kio_ghelp" ); fillInstance(instance); (void)instance.config(); // we need this one to make sure system globals are read diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 8f9b94350..577d0341d 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -91,7 +91,7 @@ int main(int argc, char **argv) { // xsltSetGenericDebugFunc(stderr, NULL); - KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ), + TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ), "$Revision$", I18N_NOOP("TDE Translator for XML")); @@ -99,7 +99,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::addCmdLineOptions( options ); KLocale::setMainCatalogue("kio_help"); - KInstance ins("meinproc"); + TDEInstance ins("meinproc"); KGlobal::locale(); diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index f9803ff0d..6653c7cd5 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -179,7 +179,7 @@ TQString splitOut(const TQString &parsed, int index) return filedata; } -void fillInstance(KInstance &ins, const TQString &srcdir) { +void fillInstance(TDEInstance &ins, const TQString &srcdir) { TQString catalogs; if ( srcdir.isEmpty() ) { diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h index 975bd3c88..c09e0c9eb 100644 --- a/kdoctools/xslt.h +++ b/kdoctools/xslt.h @@ -7,7 +7,7 @@ TQString transform(const TQString &file, const TQString& stylesheet, const TQValueVector ¶ms = TQValueVector()); TQString splitOut(const TQString &parsed, int index); -void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null ); +void fillInstance(TDEInstance &ins, const TQString &srcdir = TQString::null ); bool saveToCache( const TQString &contents, const TQString &filename ); TQString lookForCache( const TQString &filename ); TQCString fromUnicode( const TQString &data ); -- cgit v1.2.1 From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdoctools/kio_help.cpp | 4 ++-- kdoctools/meinproc.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 292c4de13..dda8fa324 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -42,9 +42,9 @@ TQString HelpProtocol::langLookup(const TQString& fname) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle"); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 577d0341d..1c47ec43f 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -100,7 +100,7 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kio_help"); TDEInstance ins("meinproc"); - KGlobal::locale(); + TDEGlobal::locale(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -171,7 +171,7 @@ int main(int argc, char **argv) { chdir( TQFile::encodeName( file.dirPath( true ) ) ); TQString cmd = exe; cmd += " --catalogs --valid --noout "; - cmd += KProcess::quote(file.fileName()); + cmd += TDEProcess::quote(file.fileName()); cmd += " 2>&1"; FILE *xmllint = popen( TQFile::encodeName( cmd ), "r"); char buf[ 512 ]; -- cgit v1.2.1 From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kdoctools/kio_help.cpp | 16 ++++++++-------- kdoctools/kio_help.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index dda8fa324..19712f826 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -35,7 +35,7 @@ #include #include "xslt.h" -using namespace KIO; +using namespace TDEIO; TQString HelpProtocol::langLookup(const TQString& fname) { @@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url ) if (doc.isEmpty()) { - error( KIO::ERR_DOES_NOT_EXIST, url.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); return; } @@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url ) struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.path() ); + error( TDEIO::ERR_IS_DIRECTORY, url.path() ); return; } if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } int fd = open( _path.data(), O_RDONLY); if ( fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } @@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url ) { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, url.path()); + error( TDEIO::ERR_COULD_NOT_READ, url.path()); close(fd); return; } diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 13c198af1..957a0e2e5 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -18,7 +18,7 @@ #include #include -class HelpProtocol : public KIO::SlaveBase +class HelpProtocol : public TDEIO::SlaveBase { public: -- cgit v1.2.1 From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kdoctools/customization/entities/general.entities | 10 ++++----- kdoctools/customization/obsolete/general.entities | 10 ++++----- kdoctools/customization/pl/user.entities | 26 +++++++++++------------ 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index 1464f600d..eb43dc8c7 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -248,8 +248,8 @@ KMathTool"> KMenuEdit"> KMessedWords"> -KMid"> -KMidi"> +KMid"> +KMidi"> KMines"> KMix"> KMoon"> @@ -299,7 +299,7 @@ TDE Screen Ruler"> KSame"> KsCD"> -KScreensaver"> +KScreensaver"> ksgmltools"> KShisen"> KSim"> @@ -311,7 +311,7 @@ KSnapshot"> KSokoban"> KSpaceDuel"> -KSpell"> +KSpell"> KSplash"> KSpread"> KStars"> @@ -421,5 +421,5 @@ Kontour"> KPanel"> KScore"> -tkmidi"> +ttdemidi"> Quanta"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index ebc4b640d..a54a96fcb 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -233,8 +233,8 @@ KMathTool"> kmenuedit"> KMessedWords"> -KMid"> -KMidi"> +KMid"> +KMidi"> KMines"> KMix"> KmPlot"> @@ -279,7 +279,7 @@ KSame"> KsCD"> KScore"> -KScreensaver"> +KScreensaver"> ksgmltools"> KShisen"> KSim"> @@ -290,7 +290,7 @@ KSnapshot"> KSokoban"> KSpaceDuel"> -KSpell"> +KSpell"> KSpread"> KStars"> kstart"> @@ -357,7 +357,7 @@ Solaris"> SuSE'> 3Com'> -tkmidi"> +ttdemidi"> TrueType'> UNIX'> URL"> diff --git a/kdoctools/customization/pl/user.entities b/kdoctools/customization/pl/user.entities index 509e433d8..73b0c4b3b 100644 --- a/kdoctools/customization/pl/user.entities +++ b/kdoctools/customization/pl/user.entities @@ -205,19 +205,19 @@ ktnef Ksysguardem'> Ksysguardzie'> -Portfel &tde;'> -Portfela &tde;'> -Portfelowi &tde;'> -Portfel &tde;'> -Portfelem &tde;'> -Portfelu &tde;'> - -Menedżer portfeli &tde;'> -Menedżera portfeli &tde;'> -Menedżerowi portfeli &tde;'> -Menedżera portfeli &tde;'> -Menedżerem portfeli &tde;'> -Menedżerze portfeli &tde;'> +Portfel &tde;'> +Portfela &tde;'> +Portfelowi &tde;'> +Portfel &tde;'> +Portfelem &tde;'> +Portfelu &tde;'> + +Menedżer portfeli &tde;'> +Menedżera portfeli &tde;'> +Menedżerowi portfeli &tde;'> +Menedżera portfeli &tde;'> +Menedżerem portfeli &tde;'> +Menedżerze portfeli &tde;'> Noatun'> Noatuna'> -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kdoctools/CMakeLists.txt | 14 +++++++------- kdoctools/Makefile.am | 8 ++++---- kdoctools/docbook/README.kde | 2 +- kdoctools/kio_help.h | 4 ++-- kdoctools/kio_help.upd | 2 +- kdoctools/move_kio_help_cache.sh | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt index 9d97712c6..09b04a8ea 100644 --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt @@ -18,9 +18,9 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kioslave + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeioslave ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ) @@ -54,7 +54,7 @@ install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_ ##### kbzipfilter_dummy ############################## tde_add_library( kbzipfilter_dummy STATIC_PIC - SOURCES ${CMAKE_SOURCE_DIR}/kioslave/bzip2/kbzip2filter.cpp + SOURCES ${CMAKE_SOURCE_DIR}/tdeioslave/bzip2/kbzip2filter.cpp ) @@ -68,7 +68,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} SHARED SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -83,7 +83,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} SHARED SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -102,6 +102,6 @@ set_source_files_properties( xslt_pure.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSL tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am index f5aab5ebe..05c3487cd 100644 --- a/kdoctools/Makefile.am +++ b/kdoctools/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeioslave -I$(top_srcdir)/tdeioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) noinst_LTLIBRARIES = libkbzipfilter_dummy.la @@ -38,10 +38,10 @@ METASOURCES = AUTO update_DATA = kio_help.upd update_SCRIPTS = move_kio_help_cache.sh -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_help.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_help.pot install-data-local: @(for subdir in customization docbook; do \ @@ -59,7 +59,7 @@ uninstall-local: -rm -rf $(DESTDIR)$(kde_datadir)/ksgmltools2/docbook kbzip2filter.cpp: - -$(LN_S) $(srcdir)/../kioslave/bzip2/kbzip2filter.cpp . + -$(LN_S) $(srcdir)/../tdeioslave/bzip2/kbzip2filter.cpp . CLEANFILES = kbzip2filter.cpp xslt_pure.o xslt_pure.cpp checkXML diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde index df33a8cba..ae080b287 100644 --- a/kdoctools/docbook/README.kde +++ b/kdoctools/docbook/README.kde @@ -1,4 +1,4 @@ -README file for tdebase/kioslave/help/docbook +README file for tdebase/tdeioslave/help/docbook ============================================= This are copies of diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 957a0e2e5..df002df15 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include class HelpProtocol : public TDEIO::SlaveBase { diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd index 2f067b148..cca96f64b 100644 --- a/kdoctools/kio_help.upd +++ b/kdoctools/kio_help.upd @@ -1,3 +1,3 @@ -# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help +# 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/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh index c31331c9e..f1342c5b4 100644 --- a/kdoctools/move_kio_help_cache.sh +++ b/kdoctools/move_kio_help_cache.sh @@ -1,6 +1,6 @@ #!/bin/sh -bas=`tde-config --localprefix`share/apps/kio_help +bas=`tde-config --localprefix`share/apps/tdeio_help mv "$bas/cache" "`tde-config --path cache`kio_help" rmdir "$bas" exit 0 -- cgit v1.2.1 From e3379a9953ab5532065dbe90bdb5a5fe14565641 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 14:20:53 -0600 Subject: Rename additional kioslave libraries --- kdoctools/CMakeLists.txt | 16 +- kdoctools/Makefile.am | 20 +- kdoctools/ghelp.protocol | 2 +- kdoctools/help.protocol | 2 +- kdoctools/kio_help.cpp | 404 ------------------------------------- kdoctools/kio_help.h | 47 ----- kdoctools/kio_help.upd | 3 - kdoctools/main.cpp | 6 +- kdoctools/main_ghelp.cpp | 6 +- kdoctools/meinproc.cpp | 2 +- kdoctools/move_kio_help_cache.sh | 6 - kdoctools/move_tdeio_help_cache.sh | 6 + kdoctools/tdeio_help.cpp | 404 +++++++++++++++++++++++++++++++++++++ kdoctools/tdeio_help.h | 47 +++++ kdoctools/tdeio_help.upd | 3 + kdoctools/xslt.cpp | 4 +- 16 files changed, 489 insertions(+), 489 deletions(-) delete mode 100644 kdoctools/kio_help.cpp delete mode 100644 kdoctools/kio_help.h delete mode 100644 kdoctools/kio_help.upd delete mode 100644 kdoctools/move_kio_help_cache.sh create mode 100644 kdoctools/move_tdeio_help_cache.sh create mode 100644 kdoctools/tdeio_help.cpp create mode 100644 kdoctools/tdeio_help.h create mode 100644 kdoctools/tdeio_help.upd (limited to 'kdoctools') 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.cpp b/kdoctools/kio_help.cpp deleted file mode 100644 index 19712f826..000000000 --- a/kdoctools/kio_help.cpp +++ /dev/null @@ -1,404 +0,0 @@ -#include - -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif - -#include -#include -#ifdef HAVE_STDIO_H -# include -#endif -#ifdef HAVE_STDLIB_H -# include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "kio_help.h" -#include -#include -#include "xslt.h" - -using namespace TDEIO; - -TQString HelpProtocol::langLookup(const TQString& fname) -{ - TQStringList search; - - // assemble the local search paths - const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); - - TQStringList langs = TDEGlobal::locale()->languageList(); - langs.append( "en" ); - langs.remove( "C" ); - - // this is kind of compat hack as we install our docs in en/ but the - // default language is en_US - for (TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) - if ( *it == "en_US" ) - *it = "en"; - - // look up the different languages - int ldCount = localDoc.count(); - for (int id=0; id < ldCount; id++) - { - TQStringList::ConstIterator lang; - for (lang = langs.begin(); lang != langs.end(); ++lang) - search.append(TQString("%1%2/%3").arg(localDoc[id], *lang, fname)); - } - - // try to locate the file - TQStringList::Iterator it; - for (it = search.begin(); it != search.end(); ++it) - { - kdDebug( 7119 ) << "Looking for help in: " << *it << endl; - - TQFileInfo info(*it); - if (info.exists() && info.isFile() && info.isReadable()) - return *it; - - if ( ( *it ).right( 5 ) == ".html" ) - { - TQString file = (*it).left((*it).findRev('/')) + "/index.docbook"; - kdDebug( 7119 ) << "Looking for help in: " << file << endl; - info.setFile(file); - if (info.exists() && info.isFile() && info.isReadable()) - return *it; - } - } - - - return TQString::null; -} - - -TQString HelpProtocol::lookupFile(const TQString &fname, - const TQString &query, bool &redirect) -{ - redirect = false; - - TQString path, result; - - path = fname; - - result = langLookup(path); - if (result.isEmpty()) - { - result = langLookup(path+"/index.html"); - if (!result.isEmpty()) - { - KURL red( "help:/" ); - red.setPath( path + "/index.html" ); - red.setQuery( query ); - redirection(red); - kdDebug( 7119 ) << "redirect to " << red.url() << endl; - redirect = true; - } - else - { - unicodeError( i18n("There is no documentation available for %1." ).arg(path) ); - finished(); - return TQString::null; - } - } else - kdDebug( 7119 ) << "result " << result << endl; - - return result; -} - - -void HelpProtocol::unicodeError( const TQString &t ) -{ - data(fromUnicode( TQString( - "\n" - "%2" ).arg( TQTextCodec::codecForLocale()->name() ).arg( t ) ) ); -} - -HelpProtocol *slave = 0; - -HelpProtocol::HelpProtocol( bool ghelp, const TQCString &pool, const TQCString &app ) - : SlaveBase( ghelp ? "ghelp" : "help", pool, app ), mGhelp( ghelp ) -{ - slave = this; -} - -void HelpProtocol::get( const KURL& url ) -{ - kdDebug( 7119 ) << "get: path=" << url.path() - << " query=" << url.query() << endl; - - bool redirect; - TQString doc; - doc = url.path(); - - if ( !mGhelp ) { - if (doc.at(0) != '/') - doc = doc.prepend('/'); - - if (doc.at(doc.length() - 1) == '/') - doc += "index.html"; - } - - infoMessage(i18n("Looking up correct file")); - - if ( !mGhelp ) { - doc = lookupFile(doc, url.query(), redirect); - - if (redirect) - { - finished(); - return; - } - } - - if (doc.isEmpty()) - { - error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); - return; - } - - mimeType("text/html"); - KURL target; - target.setPath(doc); - if (url.hasHTMLRef()) - target.setHTMLRef(url.htmlRef()); - - kdDebug( 7119 ) << "target " << target.url() << endl; - - TQString file = target.path(); - - if ( mGhelp ) { - if ( file.right( 4 ) != ".xml" ) { - get_file( target ); - return; - } - } else { - TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook"; - if (!KStandardDirs::exists(file)) { - file = docbook_file; - } else { - TQFileInfo fi(file); - if (fi.isDir()) { - file = file + "/index.docbook"; - } else { - if ( file.right( 5 ) != ".html" || !compareTimeStamps( file, docbook_file ) ) { - get_file( target ); - return; - } else - file = docbook_file; - } - } - } - - infoMessage(i18n("Preparing document")); - - if ( mGhelp ) { - TQString xsl = "customization/kde-nochunk.xsl"; - mParsed = transform(file, locate("dtd", xsl)); - - kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; - - if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:
%1" ).arg( file ) ); - } else { - int pos1 = mParsed.find( "charset=" ); - if ( pos1 > 0 ) { - int pos2 = mParsed.find( '"', pos1 ); - if ( pos2 > 0 ) { - mParsed.replace( pos1, pos2 - pos1, "charset=UTF-8" ); - } - } - data( mParsed.utf8() ); - } - } else { - - kdDebug( 7119 ) << "look for cache for " << file << endl; - - mParsed = lookForCache( file ); - - kdDebug( 7119 ) << "cached parsed " << mParsed.length() << endl; - - if ( mParsed.isEmpty() ) { - mParsed = transform(file, locate("dtd", "customization/kde-chunk.xsl")); - if ( !mParsed.isEmpty() ) { - infoMessage( i18n( "Saving to cache" ) ); - TQString cache = file.left( file.length() - 7 ); - saveToCache( mParsed, locateLocal( "cache", - "kio_help" + cache + - "cache.bz2" ) ); - } - } else infoMessage( i18n( "Using cached version" ) ); - - kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; - - if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:
%1" ).arg( file ) ); - } else { - TQString query = url.query(), anchor; - - // if we have a query, look if it contains an anchor - if (!query.isEmpty()) - if (query.left(8) == "?anchor=") { - anchor = query.mid(8).lower(); - - KURL redirURL(url); - - redirURL.setQuery(TQString::null); - redirURL.setHTMLRef(anchor); - redirection(redirURL); - finished(); - return; - } - if (anchor.isEmpty() && url.hasHTMLRef()) - anchor = url.htmlRef(); - - kdDebug( 7119 ) << "anchor: " << anchor << endl; - - if ( !anchor.isEmpty() ) - { - int index = 0; - while ( true ) { - index = mParsed.find( TQRegExp( "" ).arg( anchor ) ) - { - index = mParsed.findRev( " -#include - - -#include -#include - - -#include -#include -#include - - -#include -#include - -class HelpProtocol : public TDEIO::SlaveBase -{ -public: - - HelpProtocol( bool ghelp, const TQCString &pool, const TQCString &app); - virtual ~HelpProtocol() { } - - virtual void get( const KURL& url ); - - virtual void mimetype( const KURL& url ); - -private: - - TQString langLookup(const TQString& fname); - void emitFile( const KURL &url ); - void get_file( const KURL& url ); - TQString lookupFile(const TQString &fname, const TQString &query, - bool &redirect); - - void unicodeError( const TQString &t ); - - TQString mParsed; - bool mGhelp; -}; - - -#endif 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 #include #include -#include "kio_help.h" +#include "tdeio_help.h" #include 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 #include #include -#include "kio_help.h" +#include "tdeio_help.h" #include 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_kio_help_cache.sh deleted file mode 100644 index f1342c5b4..000000000 --- a/kdoctools/move_kio_help_cache.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -bas=`tde-config --localprefix`share/apps/tdeio_help -mv "$bas/cache" "`tde-config --path cache`kio_help" -rmdir "$bas" -exit 0 diff --git a/kdoctools/move_tdeio_help_cache.sh b/kdoctools/move_tdeio_help_cache.sh new file mode 100644 index 000000000..33096e885 --- /dev/null +++ b/kdoctools/move_tdeio_help_cache.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +bas=`tde-config --localprefix`share/apps/tdeio_help +mv "$bas/cache" "`tde-config --path cache`tdeio_help" +rmdir "$bas" +exit 0 diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp new file mode 100644 index 000000000..d6d5f285a --- /dev/null +++ b/kdoctools/tdeio_help.cpp @@ -0,0 +1,404 @@ +#include + +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif + +#include +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "tdeio_help.h" +#include +#include +#include "xslt.h" + +using namespace TDEIO; + +TQString HelpProtocol::langLookup(const TQString& fname) +{ + TQStringList search; + + // assemble the local search paths + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); + + TQStringList langs = TDEGlobal::locale()->languageList(); + langs.append( "en" ); + langs.remove( "C" ); + + // this is kind of compat hack as we install our docs in en/ but the + // default language is en_US + for (TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) + if ( *it == "en_US" ) + *it = "en"; + + // look up the different languages + int ldCount = localDoc.count(); + for (int id=0; id < ldCount; id++) + { + TQStringList::ConstIterator lang; + for (lang = langs.begin(); lang != langs.end(); ++lang) + search.append(TQString("%1%2/%3").arg(localDoc[id], *lang, fname)); + } + + // try to locate the file + TQStringList::Iterator it; + for (it = search.begin(); it != search.end(); ++it) + { + kdDebug( 7119 ) << "Looking for help in: " << *it << endl; + + TQFileInfo info(*it); + if (info.exists() && info.isFile() && info.isReadable()) + return *it; + + if ( ( *it ).right( 5 ) == ".html" ) + { + TQString file = (*it).left((*it).findRev('/')) + "/index.docbook"; + kdDebug( 7119 ) << "Looking for help in: " << file << endl; + info.setFile(file); + if (info.exists() && info.isFile() && info.isReadable()) + return *it; + } + } + + + return TQString::null; +} + + +TQString HelpProtocol::lookupFile(const TQString &fname, + const TQString &query, bool &redirect) +{ + redirect = false; + + TQString path, result; + + path = fname; + + result = langLookup(path); + if (result.isEmpty()) + { + result = langLookup(path+"/index.html"); + if (!result.isEmpty()) + { + KURL red( "help:/" ); + red.setPath( path + "/index.html" ); + red.setQuery( query ); + redirection(red); + kdDebug( 7119 ) << "redirect to " << red.url() << endl; + redirect = true; + } + else + { + unicodeError( i18n("There is no documentation available for %1." ).arg(path) ); + finished(); + return TQString::null; + } + } else + kdDebug( 7119 ) << "result " << result << endl; + + return result; +} + + +void HelpProtocol::unicodeError( const TQString &t ) +{ + data(fromUnicode( TQString( + "\n" + "%2" ).arg( TQTextCodec::codecForLocale()->name() ).arg( t ) ) ); +} + +HelpProtocol *slave = 0; + +HelpProtocol::HelpProtocol( bool ghelp, const TQCString &pool, const TQCString &app ) + : SlaveBase( ghelp ? "ghelp" : "help", pool, app ), mGhelp( ghelp ) +{ + slave = this; +} + +void HelpProtocol::get( const KURL& url ) +{ + kdDebug( 7119 ) << "get: path=" << url.path() + << " query=" << url.query() << endl; + + bool redirect; + TQString doc; + doc = url.path(); + + if ( !mGhelp ) { + if (doc.at(0) != '/') + doc = doc.prepend('/'); + + if (doc.at(doc.length() - 1) == '/') + doc += "index.html"; + } + + infoMessage(i18n("Looking up correct file")); + + if ( !mGhelp ) { + doc = lookupFile(doc, url.query(), redirect); + + if (redirect) + { + finished(); + return; + } + } + + if (doc.isEmpty()) + { + error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); + return; + } + + mimeType("text/html"); + KURL target; + target.setPath(doc); + if (url.hasHTMLRef()) + target.setHTMLRef(url.htmlRef()); + + kdDebug( 7119 ) << "target " << target.url() << endl; + + TQString file = target.path(); + + if ( mGhelp ) { + if ( file.right( 4 ) != ".xml" ) { + get_file( target ); + return; + } + } else { + TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook"; + if (!KStandardDirs::exists(file)) { + file = docbook_file; + } else { + TQFileInfo fi(file); + if (fi.isDir()) { + file = file + "/index.docbook"; + } else { + if ( file.right( 5 ) != ".html" || !compareTimeStamps( file, docbook_file ) ) { + get_file( target ); + return; + } else + file = docbook_file; + } + } + } + + infoMessage(i18n("Preparing document")); + + if ( mGhelp ) { + TQString xsl = "customization/kde-nochunk.xsl"; + mParsed = transform(file, locate("dtd", xsl)); + + kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; + + if (mParsed.isEmpty()) { + unicodeError( i18n( "The requested help file could not be parsed:
%1" ).arg( file ) ); + } else { + int pos1 = mParsed.find( "charset=" ); + if ( pos1 > 0 ) { + int pos2 = mParsed.find( '"', pos1 ); + if ( pos2 > 0 ) { + mParsed.replace( pos1, pos2 - pos1, "charset=UTF-8" ); + } + } + data( mParsed.utf8() ); + } + } else { + + kdDebug( 7119 ) << "look for cache for " << file << endl; + + mParsed = lookForCache( file ); + + kdDebug( 7119 ) << "cached parsed " << mParsed.length() << endl; + + if ( mParsed.isEmpty() ) { + mParsed = transform(file, locate("dtd", "customization/kde-chunk.xsl")); + if ( !mParsed.isEmpty() ) { + infoMessage( i18n( "Saving to cache" ) ); + TQString cache = file.left( file.length() - 7 ); + saveToCache( mParsed, locateLocal( "cache", + "tdeio_help" + cache + + "cache.bz2" ) ); + } + } else infoMessage( i18n( "Using cached version" ) ); + + kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; + + if (mParsed.isEmpty()) { + unicodeError( i18n( "The requested help file could not be parsed:
%1" ).arg( file ) ); + } else { + TQString query = url.query(), anchor; + + // if we have a query, look if it contains an anchor + if (!query.isEmpty()) + if (query.left(8) == "?anchor=") { + anchor = query.mid(8).lower(); + + KURL redirURL(url); + + redirURL.setQuery(TQString::null); + redirURL.setHTMLRef(anchor); + redirection(redirURL); + finished(); + return; + } + if (anchor.isEmpty() && url.hasHTMLRef()) + anchor = url.htmlRef(); + + kdDebug( 7119 ) << "anchor: " << anchor << endl; + + if ( !anchor.isEmpty() ) + { + int index = 0; + while ( true ) { + index = mParsed.find( TQRegExp( "" ).arg( anchor ) ) + { + index = mParsed.findRev( " +#include + + +#include +#include + + +#include +#include +#include + + +#include +#include + +class HelpProtocol : public TDEIO::SlaveBase +{ +public: + + HelpProtocol( bool ghelp, const TQCString &pool, const TQCString &app); + virtual ~HelpProtocol() { } + + virtual void get( const KURL& url ); + + virtual void mimetype( const KURL& url ); + +private: + + TQString langLookup(const TQString& fname); + void emitFile( const KURL &url ); + void get_file( const KURL& url ); + TQString lookupFile(const TQString &fname, const TQString &query, + bool &redirect); + + void unicodeError( const TQString &t ); + + TQString mParsed; + bool mGhelp; +}; + + +#endif 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 #include #include -#include "kio_help.h" +#include "tdeio_help.h" #include #include #include @@ -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; -- cgit v1.2.1 From 72eecb041bf15bf64b748fc062d55f6ec860ac60 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 14:24:03 -0600 Subject: Minor update to Doxygen references --- kdoctools/Mainpage.dox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/Mainpage.dox b/kdoctools/Mainpage.dox index e6a5120d4..0ed4d0954 100644 --- a/kdoctools/Mainpage.dox +++ b/kdoctools/Mainpage.dox @@ -1,6 +1,6 @@ /** @mainpage Trinity Documentation Tools -Provides a KIO slave for accessing application documentation for +Provides a TDEIO slave for accessing application documentation for Trinity and GNOME applications. @authors @@ -21,6 +21,6 @@ holders. */ -// DOXYGEN_REFERENCES = tdecore tdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui tdeio // DOXYGEN_SET_PROJECT_NAME = KDocTools // vim:ts=4:sw=4:expandtab:filetype=doxygen -- cgit v1.2.1 From d3afa6baf98ef5ac191996cc9b909ff9074c168c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:28:26 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- kdoctools/meinproc.cpp | 2 +- kdoctools/tdeio_help.cpp | 2 +- kdoctools/xslt.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 034218546..952e3f48f 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -163,7 +163,7 @@ int main(int argc, char **argv) { exe = XMLLINT; #endif if ( (::access( TQFile::encodeName( exe ), X_OK )!=0) ) { - exe = KStandardDirs::findExe( "xmllint" ); + exe = TDEStandardDirs::findExe( "xmllint" ); if (exe.isEmpty()) exe = locate( "exe", "xmllint" ); } diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp index d6d5f285a..d9f306b43 100644 --- a/kdoctools/tdeio_help.cpp +++ b/kdoctools/tdeio_help.cpp @@ -190,7 +190,7 @@ void HelpProtocol::get( const KURL& url ) } } else { TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook"; - if (!KStandardDirs::exists(file)) { + if (!TDEStandardDirs::exists(file)) { file = docbook_file; } else { TQFileInfo fi(file); diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index d143e0a06..2eb03cfbc 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -114,7 +114,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID, URL = "docbook/xml-dtd-4.1.2/docbookx.dtd"; TQString file; - if (KStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) ) + if (TDEStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) ) file = TQDir::currentDirPath() + "/" + URL; else file = locate("dtd", URL); @@ -186,7 +186,7 @@ void fillInstance(TDEInstance &ins, const TQString &srcdir) { catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ':'; catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat"); - ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2"); + ins.dirs()->addResourceType("dtd", TDEStandardDirs::kde_default("data") + "ksgmltools2"); } else { catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat"; ins.dirs()->addResourceDir("dtd", srcdir); -- cgit v1.2.1 From 59d153016be1e09cb31cdb18bef0a649acfc6292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:17:52 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- kdoctools/meinproc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 952e3f48f..91d973c0b 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("tdeio_help"); + TDELocale::setMainCatalogue("tdeio_help"); TDEInstance ins("meinproc"); TDEGlobal::locale(); -- cgit v1.2.1 From f2bfcad7ffdd09911f282afe2a2051b3708601c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:51 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kdoctools/customization/entities/general.entities | 2 +- kdoctools/customization/obsolete/general.entities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index eb43dc8c7..313b848fc 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -223,7 +223,7 @@ KHelpCenter"> KHexEdit"> Kicker"> -KIconEdit"> +TDEIconEdit"> Kig"> kikbd"> KInfoCenter"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index a54a96fcb..518ba097b 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -213,7 +213,7 @@ KHelpCenter"> KHexEdit"> Kicker"> -KIconEdit"> +TDEIconEdit"> kikbd"> Kit"> Kiten"> -- cgit v1.2.1 From 5466d52073af147d100482cbf633087bb9fb631b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:46:01 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- kdoctools/meinproc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 91d973c0b..730dd38d0 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -69,7 +69,7 @@ void parseEntry(PairList &list, xmlNodePtr cur, int base) } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "stylesheet ", I18N_NOOP( "Stylesheet to use" ), 0 }, { "stdout", I18N_NOOP( "Output whole document to stdout" ), 0 }, @@ -81,7 +81,7 @@ static KCmdLineOptions options[] = { "srcdir ", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0}, { "param =", I18N_NOOP( "Parameters to pass to the stylesheet" ), 0}, { "+xml", I18N_NOOP("The file to transform"), 0}, - KCmdLineLastOption // End of options. + TDECmdLineLastOption // End of options. }; -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- kdoctools/meinproc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 730dd38d0..d0a1b7323 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -18,9 +18,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kdoctools/meinproc.cpp | 2 +- kdoctools/tdeio_help.cpp | 4 ++-- kdoctools/xslt.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index d0a1b7323..51f0b913a 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp index d9f306b43..7b9d2a36e 100644 --- a/kdoctools/tdeio_help.cpp +++ b/kdoctools/tdeio_help.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 2eb03cfbc..498e6b2c8 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -12,7 +12,7 @@ #include #include #include "tdeio_help.h" -#include +#include #include #include #include -- cgit v1.2.1