summaryrefslogtreecommitdiffstats
path: root/kdoctools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kdoctools
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdoctools')
-rw-r--r--kdoctools/main.cpp2
-rw-r--r--kdoctools/main_ghelp.cpp2
-rw-r--r--kdoctools/meinproc.cpp4
-rw-r--r--kdoctools/xslt.cpp2
-rw-r--r--kdoctools/xslt.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 8e096d6c..7ba294bf 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -25,7 +25,7 @@ extern "C"
{
KDE_EXPORT int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_help" );
+ TDEInstance instance( "kio_help" );
fillInstance(instance);
(void)instance.config(); // we need this one to make sure system globals are read
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 281b31f1..bbdb5d7c 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -25,7 +25,7 @@ extern "C"
{
KDE_EXPORT int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_ghelp" );
+ TDEInstance instance( "kio_ghelp" );
fillInstance(instance);
(void)instance.config(); // we need this one to make sure system globals are read
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 8f9b9435..577d0341 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -91,7 +91,7 @@ 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"));
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::addCmdLineOptions( options );
KLocale::setMainCatalogue("kio_help");
- KInstance ins("meinproc");
+ TDEInstance ins("meinproc");
KGlobal::locale();
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index f9803ff0..6653c7cd 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() ) {
diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h
index 975bd3c8..c09e0c9e 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 );