From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kformula/kformula_factory.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kformula/kformula_factory.cc') diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index e8d3a918..8842aaea 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -14,10 +14,10 @@ K_EXPORT_COMPONENT_FACTORY( libkformulapart, KFormulaFactory ) -KInstance* KFormulaFactory::s_global = 0; -KAboutData* KFormulaFactory::s_aboutData = 0; +TDEInstance* KFormulaFactory::s_global = 0; +TDEAboutData* KFormulaFactory::s_aboutData = 0; -KAboutData* KFormulaFactory::aboutData() +TDEAboutData* KFormulaFactory::aboutData() { if( !s_aboutData ) s_aboutData=newKFormulaAboutData(); @@ -53,11 +53,11 @@ KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const c return doc; } -KInstance* KFormulaFactory::global() +TDEInstance* KFormulaFactory::global() { if ( !s_global ) { - s_global = new KInstance(aboutData()); + s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/"); // Tell the iconloader about share/apps/koffice/icons*/ -- cgit v1.2.1