From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdeui/kedittoolbar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdeui/kedittoolbar.cpp') diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 418fb755d..b89a5b97a 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -214,7 +214,7 @@ public: * In a KParts application we let create a KXMLGUIClient create a dummy one, * but it probably isn't used. */ - KEditToolbarWidgetPrivate(KInstance *instance, KActionCollection* collection) + KEditToolbarWidgetPrivate(TDEInstance *instance, KActionCollection* collection) : m_collection( collection ) { m_instance = instance; @@ -339,7 +339,7 @@ public: //TQValueList m_actionList; KActionCollection* m_collection; - KInstance *m_instance; + TDEInstance *m_instance; XmlData* m_currentXmlData; TQDomElement m_currentToolbarElem; @@ -466,7 +466,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { - const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); + const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); } else -- cgit v1.2.1