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/kcoloractions.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/kcoloractions.cpp')
| -rw-r--r-- | lib/kofficeui/kcoloractions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index e09ef63d..201afa8e 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -245,7 +245,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) if ( hasIcon() ) { /* ###### CHECK: We're not allowed to specify the instance in iconSet() - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); else @@ -281,7 +281,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) KToolBar *bar = static_cast<KToolBar *>( w ); int id_ = getToolButtonID(); - KInstance *instance; + TDEInstance *instance; if ( parentCollection() ) instance = parentCollection()->instance(); else |