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/xslt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdoctools/xslt.cpp') 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() ) { -- 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/xslt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools/xslt.cpp') 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 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/xslt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kdoctools/xslt.cpp') 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 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/xslt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdoctools/xslt.cpp') 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