summaryrefslogtreecommitdiffstats
path: root/kdoctools
diff options
context:
space:
mode:
Diffstat (limited to 'kdoctools')
-rw-r--r--kdoctools/CMakeLists.txt30
-rw-r--r--kdoctools/Mainpage.dox4
-rw-r--r--kdoctools/Makefile.am28
-rw-r--r--kdoctools/customization/entities/general.entities12
-rw-r--r--kdoctools/customization/obsolete/general.entities12
-rw-r--r--kdoctools/customization/pl/user.entities26
-rw-r--r--kdoctools/docbook/README.kde2
-rw-r--r--kdoctools/ghelp.protocol2
-rw-r--r--kdoctools/help.protocol2
-rw-r--r--kdoctools/kio_help.upd3
-rw-r--r--kdoctools/main.cpp6
-rw-r--r--kdoctools/main_ghelp.cpp6
-rw-r--r--kdoctools/meinproc.cpp28
-rw-r--r--kdoctools/move_kio_help_cache.sh6
-rw-r--r--kdoctools/move_tdeio_help_cache.sh6
-rw-r--r--kdoctools/tdeio_help.cpp (renamed from kdoctools/kio_help.cpp)32
-rw-r--r--kdoctools/tdeio_help.h (renamed from kdoctools/kio_help.h)6
-rw-r--r--kdoctools/tdeio_help.upd3
-rw-r--r--kdoctools/xslt.cpp12
-rw-r--r--kdoctools/xslt.h2
20 files changed, 114 insertions, 114 deletions
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 9d97712c6..8657e277e 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}
)
@@ -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?
@@ -54,36 +54,36 @@ 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
)
-#### 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
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}
)
-#### 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
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/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
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index f5aab5ebe..c009fd19d 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
@@ -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,12 +36,12 @@ bin_SCRIPTS = checkXML
METASOURCES = AUTO
-update_DATA = kio_help.upd
-update_SCRIPTS = move_kio_help_cache.sh
-updatedir = $(kde_datadir)/kconf_update
+update_DATA = tdeio_help.upd
+update_SCRIPTS = move_tdeio_help_cache.sh
+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/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 1464f600d..313b848fc 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -223,7 +223,7 @@
<!ENTITY khelpcenter "<application>KHelpCenter</application>">
<!ENTITY khexedit "<application>KHexEdit</application>">
<!ENTITY kicker "<application>Kicker</application>">
-<!ENTITY kiconedit "<application>KIconEdit</application>">
+<!ENTITY kiconedit "<application>TDEIconEdit</application>">
<!ENTITY kig "<application>Kig</application>">
<!ENTITY kikbd "<application>kikbd</application>">
<!ENTITY kinfocenter "<application>KInfoCenter</application>">
@@ -248,8 +248,8 @@
<!ENTITY kmathtool "<application>KMathTool</application>">
<!ENTITY kmenuedit "<application>KMenuEdit</application>">
<!ENTITY kmessedwords "<application>KMessedWords</application>">
-<!ENTITY kmid "<application>KMid</application>">
-<!ENTITY kmidi "<application>KMidi</application>">
+<!ENTITY tdemid "<application>KMid</application>">
+<!ENTITY tdemidi "<application>KMidi</application>">
<!ENTITY kmines "<application>KMines</application>">
<!ENTITY kmix "<application>KMix</application>">
<!ENTITY kmoon "<application>KMoon</application>">
@@ -299,7 +299,7 @@
<!ENTITY kruler "<application>TDE Screen Ruler</application>">
<!ENTITY ksame "<application>KSame</application>">
<!ENTITY kscd "<application>KsCD</application>">
-<!ENTITY kscreensaver "<application>KScreensaver</application>">
+<!ENTITY tdescreensaver "<application>KScreensaver</application>">
<!ENTITY ksgmltools "<application>ksgmltools</application>">
<!ENTITY kshisen "<application>KShisen</application>">
<!ENTITY ksim "<application>KSim</application>">
@@ -311,7 +311,7 @@
<!ENTITY ksnapshot "<application>KSnapshot</application>">
<!ENTITY ksokoban "<application>KSokoban</application>">
<!ENTITY kspaceduel "<application>KSpaceDuel</application>">
-<!ENTITY kspell "<application>KSpell</application>">
+<!ENTITY tdespell "<application>KSpell</application>">
<!ENTITY ksplash "<application>KSplash</application>">
<!ENTITY kspread "<application>KSpread</application>">
<!ENTITY kstars "<application>KStars</application>">
@@ -421,5 +421,5 @@
<!ENTITY kontour "<application>Kontour</application>">
<!ENTITY kpanel "<application>KPanel</application>">
<!ENTITY kscore "<application>KScore</application>">
-<!ENTITY tkmidi "<application>tkmidi</application>">
+<!ENTITY ttdemidi "<application>ttdemidi</application>">
<!ENTITY quanta "<application>Quanta</application>">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index ebc4b640d..518ba097b 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -213,7 +213,7 @@
<!ENTITY khelpcenter "<application>KHelpCenter</application>">
<!ENTITY khexedit "<application>KHexEdit</application>">
<!ENTITY kicker "<application>Kicker</application>">
-<!ENTITY kiconedit "<application>KIconEdit</application>">
+<!ENTITY kiconedit "<application>TDEIconEdit</application>">
<!ENTITY kikbd "<application>kikbd</application>">
<!ENTITY kit "<application>Kit</application>">
<!ENTITY kiten "<application>Kiten</application>">
@@ -233,8 +233,8 @@
<!ENTITY kmathtool "<application>KMathTool</application>">
<!ENTITY kmenuedit "<application>kmenuedit</application>">
<!ENTITY kmessedwords "<application>KMessedWords</application>">
-<!ENTITY kmid "<application>KMid</application>">
-<!ENTITY kmidi "<application>KMidi</application>">
+<!ENTITY tdemid "<application>KMid</application>">
+<!ENTITY tdemidi "<application>KMidi</application>">
<!ENTITY kmines "<application>KMines</application>">
<!ENTITY kmix "<application>KMix</application>">
<!ENTITY kmplot "<application>KmPlot</application>">
@@ -279,7 +279,7 @@
<!ENTITY ksame "<application>KSame</application>">
<!ENTITY kscd "<application>KsCD</application>">
<!ENTITY kscore "<application>KScore</application>">
-<!ENTITY kscreensaver "<application>KScreensaver</application>">
+<!ENTITY tdescreensaver "<application>KScreensaver</application>">
<!ENTITY ksgmltools "<application>ksgmltools</application>">
<!ENTITY kshisen "<application>KShisen</application>">
<!ENTITY ksim "<application>KSim</application>">
@@ -290,7 +290,7 @@
<!ENTITY ksnapshot "<application>KSnapshot</application>">
<!ENTITY ksokoban "<application>KSokoban</application>">
<!ENTITY kspaceduel "<application>KSpaceDuel</application>">
-<!ENTITY kspell "<application>KSpell</application>">
+<!ENTITY tdespell "<application>KSpell</application>">
<!ENTITY kspread "<application>KSpread</application>">
<!ENTITY kstars "<application>KStars</application>">
<!ENTITY kstart "<application>kstart</application>">
@@ -357,7 +357,7 @@
<!ENTITY Solaris "<trademark>Solaris</trademark>">
<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
<!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
-<!ENTITY tkmidi "<application>tkmidi</application>">
+<!ENTITY ttdemidi "<application>ttdemidi</application>">
<!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
<!ENTITY UNIX '<trademark class="registered">UNIX</trademark>'>
<!ENTITY URL "<acronym>URL</acronym>">
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
<!ENTITY ksysguard-narzednik '<application>Ksysguardem</application>'>
<!ENTITY ksysguard-miejscownik '<application>Ksysguardzie</application>'>
-<!ENTITY kwallet-mianownik '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-dopelniacz '<application>Portfela &tde;</application>'>
-<!ENTITY kwallet-celownik '<application>Portfelowi &tde;</application>'>
-<!ENTITY kwallet-biernik '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-narzednik '<application>Portfelem &tde;</application>'>
-<!ENTITY kwallet-miejscownik '<application>Portfelu &tde;</application>'>
-
-<!ENTITY kwalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'>
+<!ENTITY tdewallet-mianownik '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-dopelniacz '<application>Portfela &tde;</application>'>
+<!ENTITY tdewallet-celownik '<application>Portfelowi &tde;</application>'>
+<!ENTITY tdewallet-biernik '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-narzednik '<application>Portfelem &tde;</application>'>
+<!ENTITY tdewallet-miejscownik '<application>Portfelu &tde;</application>'>
+
+<!ENTITY tdewalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'>
<!ENTITY noatun-mianownik '<application>Noatun</application>'>
<!ENTITY noatun-dopelniacz '<application>Noatuna</application>'>
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/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 2f067b148..000000000
--- a/kdoctools/kio_help.upd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
-Id=trinity_2
-Script=move_kio_help_cache.sh,sh
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 8e096d6cf..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 )
{
- KInstance 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 281b31f17..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 )
{
- KInstance 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 1600e628f..51f0b913a 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -18,9 +18,9 @@
#include <xslt.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
#include <stdlib.h>
#include <kdebug.h>
#include <tqtextcodec.h>
@@ -69,7 +69,7 @@ void parseEntry(PairList &list, xmlNodePtr cur, int base)
}
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "stylesheet <xsl>", I18N_NOOP( "Stylesheet to use" ), 0 },
{ "stdout", I18N_NOOP( "Output whole document to stdout" ), 0 },
@@ -81,7 +81,7 @@ static KCmdLineOptions options[] =
{ "srcdir <dir>", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0},
{ "param <key>=<value>", 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.
};
@@ -91,19 +91,19 @@ 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"));
- 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();
+ TDELocale::setMainCatalogue("tdeio_help");
+ TDEInstance ins("meinproc");
+ TDEGlobal::locale();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 1 ) {
args->usage();
return ( 1 );
@@ -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" );
}
@@ -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 ];
diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh
deleted file mode 100644
index c31331c9e..000000000
--- a/kdoctools/move_kio_help_cache.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-bas=`tde-config --localprefix`share/apps/kio_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/kio_help.cpp b/kdoctools/tdeio_help.cpp
index 292c4de13..7b9d2a36e 100644
--- a/kdoctools/kio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -25,26 +25,26 @@
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#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"
-using namespace KIO;
+using namespace TDEIO;
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" );
@@ -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;
}
@@ -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);
@@ -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)
@@ -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/tdeio_help.h
index 13c198af1..df002df15 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/tdeio_help.h
@@ -15,10 +15,10 @@
#include <tqvaluelist.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
-class HelpProtocol : public KIO::SlaveBase
+class HelpProtocol : public TDEIO::SlaveBase
{
public:
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 f9803ff0d..498e6b2c8 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -11,8 +11,8 @@
#include <tqregexp.h>
#include <xslt.h>
#include <kinstance.h>
-#include "kio_help.h"
-#include <klocale.h>
+#include "tdeio_help.h"
+#include <tdelocale.h>
#include <assert.h>
#include <kfilterbase.h>
#include <kfilterdev.h>
@@ -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);
@@ -179,14 +179,14 @@ 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() ) {
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);
@@ -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;
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<const char *> &params = TQValueVector<const char *>());
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 );
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-09 17:23:27 +0000