diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/ntqtoolbutton.h | 10 | ||||
| -rw-r--r-- | src/widgets/qtoolbutton.cpp | 105 |
2 files changed, 0 insertions, 115 deletions
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 84909de56..0ece3a9fc 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -60,8 +60,6 @@ class Q_EXPORT TQToolButton : public TQButton TQ_ENUMS( TextPosition ) TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) - TQ_PROPERTY( TQIconSet onIconSet READ onIconSet WRITE setOnIconSet DESIGNABLE false STORED false ) - TQ_PROPERTY( TQIconSet offIconSet READ offIconSet WRITE setOffIconSet DESIGNABLE false STORED false ) TQ_PROPERTY( bool usesBigPixmap READ usesBigPixmap WRITE setUsesBigPixmap ) TQ_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel ) TQ_PROPERTY( TQString textLabel READ textLabel WRITE setTextLabel ) @@ -94,14 +92,6 @@ public: TQSize sizeHint() const; TQSize minimumSizeHint() const; -#ifndef TQT_NO_COMPAT - void setOnIconSet( const TQIconSet& ); - void setOffIconSet( const TQIconSet& ); - void setIconSet( const TQIconSet &, bool on ); - TQIconSet onIconSet() const; - TQIconSet offIconSet( ) const; - TQIconSet iconSet( bool on ) const; -#endif virtual void setIconSet( const TQIconSet & ); TQIconSet iconSet() const; diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 74f3f4ade..1316944f0 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -38,7 +38,6 @@ ** **********************************************************************/ -#undef TQT_NO_COMPAT #include "ntqtoolbutton.h" #ifndef TQT_NO_TOOLBUTTON @@ -685,69 +684,6 @@ void TQToolButton::setTextLabel( const TQString &newLabel , bool tipToo ) } -#ifndef TQT_NO_COMPAT - -TQIconSet TQToolButton::onIconSet() const -{ - return iconSet(); -} - -TQIconSet TQToolButton::offIconSet( ) const -{ - return iconSet(); -} - - -/*! - \property TQToolButton::onIconSet - \brief the icon set that is used when the button is in an "on" state - - \obsolete - - Since TQt 3.0, TQIconSet contains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that replaces both \l - TQToolButton::onIconSet and \l TQToolButton::offIconSet. - - For ease of porting, this property is a synonym for \l - TQToolButton::iconSet. You probably want to go over your application - code and use the TQIconSet On/Off mechanism. - - \sa iconSet TQIconSet::State -*/ -void TQToolButton::setOnIconSet( const TQIconSet& set ) -{ - setIconSet( set ); - /* - ### Get rid of all tqWarning in this file in 4.0. - Also consider inlining the obsolete functions then. - */ - tqWarning( "TQToolButton::setOnIconSet(): This function is not supported" - " anymore" ); -} - -/*! - \property TQToolButton::offIconSet - \brief the icon set that is used when the button is in an "off" state - - \obsolete - - Since TQt 3.0, TQIconSet contains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that replaces both \l - TQToolButton::onIconSet and \l TQToolButton::offIconSet. - - For ease of porting, this property is a synonym for \l - TQToolButton::iconSet. You probably want to go over your application - code and use the TQIconSet On/Off mechanism. - - \sa iconSet TQIconSet::State -*/ -void TQToolButton::setOffIconSet( const TQIconSet& set ) -{ - setIconSet( set ); -} - -#endif - /*! \property TQToolButton::pixmap \brief the pixmap of the button @@ -774,29 +710,6 @@ void TQToolButton::setIconSet( const TQIconSet & set ) update(); } -/*! \overload - \obsolete - - Since TQt 3.0, TQIconSet contains both the On and Off icons. - - For ease of porting, this function ignores the \a on parameter and - sets the \l iconSet property. If you relied on the \a on parameter, - you probably want to update your code to use the TQIconSet On/Off - mechanism. - - \sa iconSet TQIconSet::State -*/ - -#ifndef TQT_NO_COMPAT - -void TQToolButton::setIconSet( const TQIconSet & set, bool /* on */ ) -{ - setIconSet( set ); - tqWarning( "TQToolButton::setIconSet(): 'on' parameter ignored" ); -} - -#endif - TQIconSet TQToolButton::iconSet() const { TQToolButton *that = (TQToolButton *) this; @@ -818,24 +731,6 @@ TQIconSet TQToolButton::iconSet() const return TQIconSet(); } -#ifndef TQT_NO_COMPAT -/*! \overload - \obsolete - - Since TQt 3.0, TQIconSet contains both the On and Off icons. - - For ease of porting, this function ignores the \a on parameter and - returns the \l iconSet property. If you relied on the \a on - parameter, you probably want to update your code to use the TQIconSet - On/Off mechanism. -*/ -TQIconSet TQToolButton::iconSet( bool /* on */ ) const -{ - return iconSet(); -} - -#endif - #ifndef TQT_NO_POPUPMENU /*! Associates the popup menu \a popup with this tool button. |