diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /kdoctools/xslt.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kdoctools/xslt.cpp')
| -rw-r--r-- | kdoctools/xslt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; |