diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/ktoolbarbutton.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/ktoolbarbutton.cpp')
| -rw-r--r-- | tdeui/ktoolbarbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 1316081c6..66b9d6ee9 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -93,7 +93,7 @@ public: TQPoint m_mousePressPos; - KInstance *m_instance; + TDEInstance *m_instance; }; // This will construct a separator @@ -109,7 +109,7 @@ KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name ) KToolBarButton::KToolBarButton( const TQString& _icon, int _id, TQWidget *_parent, const char *_name, - const TQString &_txt, KInstance *_instance ) + const TQString &_txt, TDEInstance *_instance ) : TQToolButton( _parent, _name ), d( 0 ) { d = new KToolBarButtonPrivate; |