From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:55:40 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 lib/kofficecore/KoMainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/kofficecore/KoMainWindow.cpp')

diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 19fea8238..2487993aa 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -183,7 +183,7 @@ public:
   KSharedPtr<KoSpeaker> m_koSpeaker;
 };
 
-KoMainWindow::KoMainWindow( KInstance *instance, const char* name )
+KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     : KParts::MainWindow( name )
 {
     setStandardToolBarMenuEnabled(true); // should there be a check for >= 3.1 ?
-- 
cgit v1.2.3