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

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

diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index a86d799a2..e020213ef 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -45,7 +45,7 @@ KoTemplate::KoTemplate(const TQString &name, const TQString &description, const
 {
 }
 
-const TQPixmap &KoTemplate::loadPicture( KInstance* instance ) {
+const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) {
 
     if(m_cached)
         return m_pixmap;
@@ -130,7 +130,7 @@ KoTemplate *KoTemplateGroup::find(const TQString &name) const {
 
 
 KoTemplateTree::KoTemplateTree(const TQCString &templateType,
-                               KInstance *instance, bool readTree) :
+                               TDEInstance *instance, bool readTree) :
     m_templateType(templateType), m_instance(instance), m_defaultGroup(0L),
     m_defaultTemplate(0L) {
 
-- 
cgit v1.2.3