diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kxmlguiclient.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/kxmlguiclient.cpp')
| -rw-r--r-- | tdeui/kxmlguiclient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index ff463e45f..d8548cadb 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -50,7 +50,7 @@ public: { } - KInstance *m_instance; + TDEInstance *m_instance; TQDomDocument m_doc; KActionCollection *m_actionCollection; @@ -120,7 +120,7 @@ KAction *KXMLGUIClient::action( const TQDomElement &element ) const return actionCollection()->action( element.attribute( attrName ).latin1() ); } -KInstance *KXMLGUIClient::instance() const +TDEInstance *KXMLGUIClient::instance() const { return d->m_instance; } @@ -154,7 +154,7 @@ void KXMLGUIClient::reloadXML() setXMLFile( file ); } -void KXMLGUIClient::setInstance( KInstance *instance ) +void KXMLGUIClient::setInstance( TDEInstance *instance ) { d->m_instance = instance; actionCollection()->setInstance( instance ); |