diff --git a/src/ioslaves/help/CMakeLists.txt b/src/ioslaves/help/CMakeLists.txt --- a/src/ioslaves/help/CMakeLists.txt +++ b/src/ioslaves/help/CMakeLists.txt @@ -49,7 +49,7 @@ KF5::I18n KF5::Archive KF5::KIOCore - KF5::XsltKde + KF5::DocTools ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} @@ -71,7 +71,7 @@ KF5::I18n KF5::Archive KF5::KIOCore - KF5::XsltKde + KF5::DocTools ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp --- a/src/ioslaves/help/kio_help.cpp +++ b/src/ioslaves/help/kio_help.cpp @@ -22,9 +22,10 @@ #include #include "kio_help.h" -#include "xslt.h" #include "xslt_help.h" +#include + #include #include @@ -225,7 +226,7 @@ if (mGhelp) { QString xsl = QStringLiteral("customization/kde-nochunk.xsl"); - mParsed = transform(file, locateFileInDtdResource(xsl)); + mParsed = KDocTools::transform(file, KDocTools::locateFileInDtdResource(xsl)); //qDebug() << "parsed " << mParsed.length(); @@ -250,7 +251,7 @@ //qDebug() << "cached parsed " << mParsed.length(); if (mParsed.isEmpty()) { - mParsed = transform(file, locateFileInDtdResource(QStringLiteral("customization/kde-chunk.xsl"))); + mParsed = KDocTools::transform(file, KDocTools::locateFileInDtdResource(QStringLiteral("customization/kde-chunk.xsl"))); if (!mParsed.isEmpty()) { infoMessage(i18n("Saving to cache")); #ifdef Q_OS_WIN @@ -265,8 +266,8 @@ #else QString cache = file.left(file.length() - 7); #endif - saveToCache(mParsed, QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) - + "/kio_help" + cache + "cache.bz2"); + KDocTools::saveToCache(mParsed, QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + + "/kio_help" + cache + "cache.bz2"); } } else { infoMessage(i18n("Using cached version")); @@ -335,7 +336,7 @@ QString filename = url.path().mid(url.path().lastIndexOf('/') + 1); - QByteArray result = extractFileToBuffer(mParsed, filename); + QByteArray result = KDocTools::extractFileToBuffer(mParsed, filename); if (result.isNull()) { sendError(i18n("Could not find filename %1 in %2.", filename, url.toString())); diff --git a/src/ioslaves/help/main.cpp b/src/ioslaves/help/main.cpp --- a/src/ioslaves/help/main.cpp +++ b/src/ioslaves/help/main.cpp @@ -5,7 +5,8 @@ #endif #include "kio_help.h" -#include "xslt.h" + +#include #include @@ -39,7 +40,7 @@ { Q_DECL_EXPORT int kdemain(int argc, char **argv) { - setupStandardDirs(); + KDocTools::setupStandardDirs(); //qDebug() << "Starting " << getpid(); diff --git a/src/ioslaves/help/main_ghelp.cpp b/src/ioslaves/help/main_ghelp.cpp --- a/src/ioslaves/help/main_ghelp.cpp +++ b/src/ioslaves/help/main_ghelp.cpp @@ -6,7 +6,8 @@ #endif #include "kio_help.h" -#include "xslt.h" + +#include #include @@ -38,7 +39,7 @@ { Q_DECL_EXPORT int kdemain(int argc, char **argv) { - setupStandardDirs(); + KDocTools::setupStandardDirs(); //qDebug() << "Starting " << getpid(); diff --git a/src/ioslaves/help/xslt_help.cpp b/src/ioslaves/help/xslt_help.cpp --- a/src/ioslaves/help/xslt_help.cpp +++ b/src/ioslaves/help/xslt_help.cpp @@ -1,5 +1,6 @@ #include "xslt_help.h" -#include "xslt.h" + +#include #include #include @@ -24,7 +25,7 @@ if (!compareTimeStamps(filename, cache)) { return false; } - if (!compareTimeStamps(locateFileInDtdResource(QStringLiteral("customization/kde-chunk.xsl")), cache)) { + if (!compareTimeStamps(KDocTools::locateFileInDtdResource(QStringLiteral("customization/kde-chunk.xsl")), cache)) { return false; }