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/KoDetailsPane.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 66828e99..1e204af7 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -75,13 +75,13 @@ class KoTemplatesPanePrivate
     {
     }
 
-    KInstance* m_instance;
+    TDEInstance* m_instance;
     bool m_selected;
     TQString m_alwaysUseTemplate;
 };
 
 
-KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance,
+KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
                                  KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/)
   : KoDetailsPaneBase(parent, "TemplatesPane")
 {
@@ -265,10 +265,10 @@ class KoRecentDocumentsPanePrivate
     }
 
     KIO::PreviewJob* m_previewJob;
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
-KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance)
+KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* instance)
   : KoDetailsPaneBase(parent, "RecentDocsPane")
 {
   d = new KoRecentDocumentsPanePrivate;
-- 
cgit v1.2.1