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/tktoolbarbutton.h | |
| 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/tktoolbarbutton.h')
| -rw-r--r-- | lib/kofficeui/tktoolbarbutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 17fc3758..bfa3a148 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -27,7 +27,7 @@ #include <kglobal.h> class KToolBar; -class KInstance; +class TDEInstance; class TQPopupMenu; class TQPainter; @@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton public: TKToolBarButton(const TQString& icon, const TQString& txt, TQWidget* parent = 0, const char *name=0L, - KInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = KGlobal::instance()); TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); ~TKToolBarButton(); |