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/kaction.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/kaction.cpp')
| -rw-r--r-- | tdeui/kaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 4937b3a87..89e397450 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -658,7 +658,7 @@ int KAction::plug( TQWidget *w, int index ) if ( d->hasIcon() ) { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); else @@ -698,7 +698,7 @@ int KAction::plug( TQWidget *w, int index ) KToolBar *bar = static_cast<KToolBar *>( w ); int id_ = getToolButtonID(); - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); else |