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

---
 xparts/mozilla/kmozillapart.cpp           | 4 ++--
 xparts/mozilla/kmozillapart.h             | 4 ++--
 xparts/xpart_notepad/xp_notepad_factory.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xparts')

diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp
index cb61e5e3..a853f737 100644
--- a/xparts/mozilla/kmozillapart.cpp
+++ b/xparts/mozilla/kmozillapart.cpp
@@ -43,9 +43,9 @@ void KMozillaPart::createActions( const TQCString &xmlActions )
     kapp->exit_loop();
 }
 
-KAboutData *KMozillaPart::createAboutData()
+TDEAboutData *KMozillaPart::createAboutData()
 {
-    return new KAboutData( "kmozilla", "kmozilla", "0.1" );
+    return new TDEAboutData( "kmozilla", "kmozilla", "0.1" );
 }
 
 #include "kmozillapart.moc"
diff --git a/xparts/mozilla/kmozillapart.h b/xparts/mozilla/kmozillapart.h
index a312d894..2df5506a 100644
--- a/xparts/mozilla/kmozillapart.h
+++ b/xparts/mozilla/kmozillapart.h
@@ -3,7 +3,7 @@
 
 #include "xparthost_kpart.h"
 
-class KAboutData;
+class TDEAboutData;
 class KProcess;
 
 class KMozillaPart : public XPartHost_KPart
@@ -17,7 +17,7 @@ public:
 
     virtual void createActions( const TQCString &xmlActions );
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
 private:
     KProcess *m_partProcess;
diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h
index 018a5619..c499cd0e 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.h
+++ b/xparts/xpart_notepad/xp_notepad_factory.h
@@ -26,8 +26,8 @@
 #include <kurl.h>
 #include "xparthost_kpart.h"
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class KHTMLSettings;
 class KHTMLPart;
 class KProcess;
-- 
cgit v1.2.1