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

---
 kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 8 ++++----
 kttsd/kcmkttsmgr/kcmkttsmgr.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kttsd/kcmkttsmgr')

diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index b07a885..2b8cd93 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -1075,10 +1075,10 @@ TQString KCMKttsMgr::quickHelp() const{
         "<p>Be sure to configure a default language for the language you are using as this will be the language used by most of the applications</p>");
 }
 
-const KAboutData* KCMKttsMgr::aboutData() const{
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"),
-        0, 0, KAboutData::License_GPL,
+const TDEAboutData* KCMKttsMgr::aboutData() const{
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"),
+        0, 0, TDEAboutData::License_GPL,
         I18N_NOOP("(c) 2002, José Pablo Ezequiel Fernández"));
 
     about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org");
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h
index e311a4e..be03565 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.h
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h
@@ -40,7 +40,7 @@
 class PlugInConf;
 class KttsFilterConf;
 class KListViewItem;
-class KAboutData;
+class TDEAboutData;
 class KConfig;
 class TQPopupMenu;
 
@@ -115,7 +115,7 @@ class KCMKttsMgr :
         /**
         * Return the about information for this module
         */
-        const KAboutData* aboutData() const;
+        const TDEAboutData* aboutData() const;
 
     public slots:
         /**
-- 
cgit v1.2.1