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/knotes/knotes_plugin.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kontact/plugins/knotes/knotes_plugin.h')

diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index 12d485404..fe17bad52 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -42,7 +42,7 @@ class KNotesPlugin : public Kontact::Plugin
 
     int weight() const { return 600; }
 
-    const KAboutData *aboutData();
+    const TDEAboutData *aboutData();
 
   protected:
     KParts::ReadOnlyPart* createPart();
@@ -52,7 +52,7 @@ class KNotesPlugin : public Kontact::Plugin
     void slotSyncNotes();
 
   private:
-    KAboutData *mAboutData;
+    TDEAboutData *mAboutData;
 };
 
 #endif
-- 
cgit v1.2.1