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/kactionclasses.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/kactionclasses.cpp')
| -rw-r--r-- | tdeui/kactionclasses.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index 9e2241408..e83a9f05d 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -1278,7 +1278,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) int id_ = KAction::getToolButtonID(); - KInstance * instance; + TDEInstance * instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); else @@ -1827,7 +1827,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) index ); else { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); @@ -1954,7 +1954,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) isEnabled(), plainText(), index ); } else { - KInstance * instance; + TDEInstance * instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); else @@ -2290,7 +2290,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) int id_ = KAction::getToolButtonID(); - KInstance * instance; + TDEInstance * instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); else |