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