diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /lib/kofficeui/tkaction.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/tkaction.cpp')
| -rw-r--r-- | lib/kofficeui/tkaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 65b4de02..402c8d2c 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -56,7 +56,7 @@ int TKAction::plug(TQWidget* widget, int index) if ( widget->inherits("KToolBar") ) { KToolBar* bar = static_cast<KToolBar*>(widget); int id_ = KAction::getToolButtonID(); - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); |