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

---
 kontact/plugins/newsticker/kcmkontactknt.cpp | 6 +++---
 kontact/plugins/newsticker/kcmkontactknt.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kontact/plugins/newsticker')

diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index cfcbc43d2..0a059da3b 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -437,11 +437,11 @@ void KCMKontactKNT::defaults()
 {
 }
 
-const KAboutData* KCMKontactKNT::aboutData() const
+const TDEAboutData* KCMKontactKNT::aboutData() const
 {
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkontactknt" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkontactknt" ),
                                       I18N_NOOP( "Newsticker Configuration Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index b3a56d0ac..0f9c15481 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -29,7 +29,7 @@
 class TQListViewItem;
 class TQSpinxBox;
 
-class KAboutData;
+class TDEAboutData;
 class KListView;
 class KPushButton;
 
@@ -46,7 +46,7 @@ class KCMKontactKNT : public KCModule
     virtual void load();
     virtual void save();
     virtual void defaults();
-    virtual const KAboutData* aboutData() const;
+    virtual const TDEAboutData* aboutData() const;
 
   private slots:
     void addNews();
-- 
cgit v1.2.1