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

---
 konqueror/konq_factory.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'konqueror/konq_factory.h')

diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index ac24061e6..4307defb9 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -32,7 +32,7 @@
 
 class BrowserView;
 class KonqMainWindow;
-class KAboutData;
+class TDEAboutData;
 
 class KonqViewFactory
 {
@@ -77,10 +77,10 @@ public:
                          KTrader::OfferList *partServiceOffers = 0,
                          KTrader::OfferList *appServiceOffers = 0);
 
-  static const KAboutData* aboutData();
+  static const TDEAboutData* aboutData();
 
 private:
-  static KAboutData *s_aboutData;
+  static TDEAboutData *s_aboutData;
 };
 
 #endif
-- 
cgit v1.2.3