From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:15:55 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 khelpcenter/application.cpp      | 4 ++--
 khelpcenter/htmlsearch/index.cpp | 2 +-
 khelpcenter/kcmhelpcenter.h      | 4 ++--
 khelpcenter/khc_indexbuilder.cpp | 4 ++--
 khelpcenter/testmetainfo.cpp     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'khelpcenter')

diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 506a6eda5..6fa5aeca5 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -60,10 +60,10 @@ static KCmdLineOptions options[] =
 
 extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 {
-  KAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"),
+  TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"),
                         HELPCENTER_VERSION,
                         I18N_NOOP("The Trinity Help Center"),
-                        KAboutData::License_GPL,
+                        TDEAboutData::License_GPL,
                         I18N_NOOP("(c) 1999-2003, The KHelpCenter developers") );
 
   aboutData.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index eb73d11cd..c7b5bce41 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -15,7 +15,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
+  TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
 	"",
 	I18N_NOOP("TDE Index generator for help files."));
 
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 8bf2f3b6c..a5a336afc 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -34,7 +34,7 @@ class TQLabel;
 
 class KProcess;
 class KConfig;
-class KAboutData;
+class TDEAboutData;
 class KTempFile;
 class KURLRequester;
 class KListView;
@@ -164,7 +164,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
     
     KConfig *mConfig;
     
-    KAboutData *mAboutData;
+    TDEAboutData *mAboutData;
 
     KHC::HtmlSearchConfig *mHtmlSearchTab;
     TQWidget *mScopeTab;
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 03a076651..3759b3048 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -170,11 +170,11 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "khc_indexbuilder",
+  TDEAboutData aboutData( "khc_indexbuilder",
                         I18N_NOOP("KHelpCenter Index Builder"),
                         HELPCENTER_VERSION,
                         I18N_NOOP("The TDE Help Center"),
-                        KAboutData::License_GPL,
+                        TDEAboutData::License_GPL,
                         I18N_NOOP("(c) 2003, The KHelpCenter developers") );
 
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index e5d204461..a6fed9e09 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -88,7 +88,7 @@ class AsyncTraverser : public DocEntryTraverser
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
+  TDEAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;
-- 
cgit v1.2.1