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/kxmlguifactory_p.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/kxmlguifactory_p.cpp')
| -rw-r--r-- | tdeui/kxmlguifactory_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp index 279753277..26d120de7 100644 --- a/tdeui/kxmlguifactory_p.cpp +++ b/tdeui/kxmlguifactory_p.cpp @@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index, } } - KInstance *oldInstance = m_state.builder->builderInstance(); + TDEInstance *oldInstance = m_state.builder->builderInstance(); KXMLGUIClient *oldClient = m_state.builder->builderClient(); m_state.builder->setBuilderClient( m_state.guiClient ); |