diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kedittoolbar.cpp | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kedittoolbar.cpp')
-rw-r--r-- | tdeui/kedittoolbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<KAction*> 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 |