summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore/KoTemplates.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /lib/kofficecore/KoTemplates.cpp
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore/KoTemplates.cpp')
-rw-r--r--lib/kofficecore/KoTemplates.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index a86d799a..e020213e 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) {