Drop compatibility code for TQToolButton

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 13 insertions, 333 deletions

diff --git a/doc/html/ntqtoolbutton.html b/doc/html/ntqtoolbutton.html
index 95c588c9e..d8886421d 100644
--- a/doc/html/ntqtoolbutton.html
+++ b/doc/html/ntqtoolbutton.html
@@ -44,12 +44,6 @@ commands or options, usually used inside a TQToolBar.
 <li class=fn><a href="#TQToolButton-2"><b>TQToolButton</b></a> ( const&nbsp;TQIconSet&nbsp;&amp;&nbsp;iconSet, const&nbsp;TQString&nbsp;&amp;&nbsp;textLabel, const&nbsp;TQString&nbsp;&amp;&nbsp;grouptext, TQObject&nbsp;*&nbsp;receiver, const&nbsp;char&nbsp;*&nbsp;slot, TQToolBar&nbsp;*&nbsp;parent, const&nbsp;char&nbsp;*&nbsp;name = 0 )</li>
 <li class=fn><a href="#TQToolButton-3"><b>TQToolButton</b></a> ( ArrowType&nbsp;type, TQWidget&nbsp;*&nbsp;parent, const&nbsp;char&nbsp;*&nbsp;name = 0 )</li>
 <li class=fn><a href="#~TQToolButton"><b>~TQToolButton</b></a> ()</li>
-<li class=fn>void setOnIconSet ( const TQIconSet &amp; ) &nbsp;<em>(obsolete)</em></li>
-<li class=fn>void setOffIconSet ( const TQIconSet &amp; ) &nbsp;<em>(obsolete)</em></li>
-<li class=fn>void setIconSet ( const&nbsp;TQIconSet&nbsp;&amp;&nbsp;set, bool&nbsp;on ) &nbsp;<em>(obsolete)</em></li>
-<li class=fn>TQIconSet onIconSet () const &nbsp;<em>(obsolete)</em></li>
-<li class=fn>TQIconSet offIconSet () const &nbsp;<em>(obsolete)</em></li>
-<li class=fn>TQIconSet iconSet ( bool&nbsp;on ) const &nbsp;<em>(obsolete)</em></li>
 <li class=fn>virtual void <a href="#setIconSet"><b>setIconSet</b></a> ( const TQIconSet &amp; )</li>
 <li class=fn>TQIconSet <a href="#iconSet"><b>iconSet</b></a> () const</li>
 <li class=fn>bool <a href="#usesBigPixmap"><b>usesBigPixmap</b></a> () const</li>
@@ -80,9 +74,7 @@ commands or options, usually used inside a TQToolBar.
 <li class=fn>bool <a href="#autoRaise-prop"><b>autoRaise</b></a>&nbsp;- whether auto-raising is enabled</li>
 <li class=fn>BackgroundMode <a href="#backgroundMode-prop"><b>backgroundMode</b></a>&nbsp;- the toolbutton's background mode &nbsp;<em>(read only)</em></li>
 <li class=fn>TQIconSet <a href="#iconSet-prop"><b>iconSet</b></a>&nbsp;- the icon set providing the icon shown on the button</li>
-<li class=fn>TQIconSet offIconSet&nbsp;- the icon set that is used when the button is in an "off" state &nbsp;<em>(obsolete)</em></li>
 <li class=fn>bool <a href="#on-prop"><b>on</b></a>&nbsp;- whether this tool button is on</li>
-<li class=fn>TQIconSet onIconSet&nbsp;- the icon set that is used when the button is in an "on" state &nbsp;<em>(obsolete)</em></li>
 <li class=fn>TQPixmap <a href="#pixmap-prop"><b>pixmap</b></a>&nbsp;- the pixmap of the button &nbsp;<em>(read only)</em></li>
 <li class=fn>int <a href="#popupDelay-prop"><b>popupDelay</b></a>&nbsp;- the time delay between pressing the button and the appearance of the associated popup menu in milliseconds</li>
 <li class=fn>TQString <a href="#textLabel-prop"><b>textLabel</b></a>&nbsp;- the label of this button</li>
@@ -171,21 +163,7 @@ See the <a href="ntqtoolbutton.html#autoRaise-prop">"autoRaise"</a> property for
 <h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="iconSet"></a>TQToolButton::iconSet () const
 </h3><p>Returns the icon set providing the icon shown on the button.
 See the <a href="ntqtoolbutton.html#iconSet-prop">"iconSet"</a> property for details.
-<h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="iconSet-2"></a>TQToolButton::iconSet ( bool&nbsp;on ) const
-</h3> This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-<p> <b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> Since TQt 3.0, <a href="ntqiconset.html">TQIconSet</a> contains both the On and Off icons.
-<p> For ease of porting, this function ignores the <em>on</em> parameter and
-returns the <a href="#iconSet-prop">iconSet</a> property. If you relied on the <em>on</em>
-parameter, you probably want to update your code to use the TQIconSet
-On/Off mechanism.
 
-<h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="offIconSet"></a>TQToolButton::offIconSet () const
-</h3><p>Returns the icon set that is used when the button is in an "off" state.
-See the <a href="ntqtoolbutton.html#offIconSet-prop">"offIconSet"</a> property for details.
-<h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="onIconSet"></a>TQToolButton::onIconSet () const
-</h3><p>Returns the icon set that is used when the button is in an "on" state.
-See the <a href="ntqtoolbutton.html#onIconSet-prop">"onIconSet"</a> property for details.
 <h3 class=fn>void <a name="openPopup"></a>TQToolButton::openPopup ()
 </h3>
 Opens (pops up) the associated popup menu. If there is no such
@@ -207,25 +185,10 @@ See the <a href="ntqtoolbutton.html#autoRaise-prop">"autoRaise"</a> property for
 <h3 class=fn>void <a name="setIconSet"></a>TQToolButton::setIconSet ( const&nbsp;<a href="ntqiconset.html">TQIconSet</a>&nbsp;&amp; )<tt> [virtual]</tt>
 </h3><p>Sets the icon set providing the icon shown on the button.
 See the <a href="ntqtoolbutton.html#iconSet-prop">"iconSet"</a> property for details.
-<h3 class=fn>void <a name="setIconSet-2"></a>TQToolButton::setIconSet ( const&nbsp;<a href="ntqiconset.html">TQIconSet</a>&nbsp;&amp;&nbsp;set, bool&nbsp;on )
-</h3> This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-<p> <b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> Since TQt 3.0, <a href="ntqiconset.html">TQIconSet</a> contains both the On and Off icons.
-<p> For ease of porting, this function ignores the <em>on</em> parameter and
-sets the <a href="#iconSet-prop">iconSet</a> property. If you relied on the <em>on</em> parameter,
-you probably want to update your code to use the TQIconSet On/Off
-mechanism.
-<p> <p>See also <a href="#iconSet-prop">iconSet</a> and <a href="ntqiconset.html#State-enum">TQIconSet::State</a>.
 
-<h3 class=fn>void <a name="setOffIconSet"></a>TQToolButton::setOffIconSet ( const&nbsp;<a href="ntqiconset.html">TQIconSet</a>&nbsp;&amp; )
-</h3><p>Sets the icon set that is used when the button is in an "off" state.
-See the <a href="ntqtoolbutton.html#offIconSet-prop">"offIconSet"</a> property for details.
 <h3 class=fn>void <a name="setOn"></a>TQToolButton::setOn ( bool&nbsp;enable )<tt> [virtual slot]</tt>
 </h3><p>Sets whether this tool button is on to <em>enable</em>.
 See the <a href="ntqtoolbutton.html#on-prop">"on"</a> property for details.
-<h3 class=fn>void <a name="setOnIconSet"></a>TQToolButton::setOnIconSet ( const&nbsp;<a href="ntqiconset.html">TQIconSet</a>&nbsp;&amp; )
-</h3><p>Sets the icon set that is used when the button is in an "on" state.
-See the <a href="ntqtoolbutton.html#onIconSet-prop">"onIconSet"</a> property for details.
 <h3 class=fn>void <a name="setPopup"></a>TQToolButton::setPopup ( <a href="ntqpopupmenu.html">TQPopupMenu</a>&nbsp;*&nbsp;popup )
 </h3>
 Associates the popup menu <em>popup</em> with this tool button.
@@ -303,35 +266,15 @@ See the <a href="ntqtoolbutton.html#usesTextLabel-prop">"usesTextLabel"</a> prop
 <p>Setting this property sets <a href="#pixmap-prop">TQToolButton::pixmap</a> to a null
 pixmap. There is no default iconset.
 <p> <p>See also <a href="#pixmap-prop">pixmap</a>, <a href="#toggleButton-prop">toggleButton</a>, and <a href="#on-prop">on</a>.
-
 <p>Set this property's value with <a href="#setIconSet">setIconSet</a>() and get this property's value with <a href="#iconSet">iconSet</a>().
-<h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="offIconSet-prop"></a>offIconSet</h3>
-<p>This property holds the icon set that is used when the button is in an "off" state.
-<p><b>This property is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> Since TQt 3.0, <a href="ntqiconset.html">TQIconSet</a> contains both the On and Off icons. There is
-now an <a href="#iconSet-prop">TQToolButton::iconSet</a> property that replaces both <a href="#onIconSet-prop">TQToolButton::onIconSet</a> and <a href="#offIconSet-prop">TQToolButton::offIconSet</a>.
-<p> For ease of porting, this property is a synonym for <a href="#iconSet-prop">TQToolButton::iconSet</a>. You probably want to go over your application
-code and use the TQIconSet On/Off mechanism.
-<p> <p>See also <a href="#iconSet-prop">iconSet</a> and <a href="ntqiconset.html#State-enum">TQIconSet::State</a>.
 
-<p>Set this property's value with <a href="#setOffIconSet">setOffIconSet</a>() and get this property's value with <a href="#offIconSet">offIconSet</a>().
 <h3 class=fn>bool <a name="on-prop"></a>on</h3>
 <p>This property holds whether this tool button is on.
 <p>This property has no effect on <a href="ntqbutton.html#isToggleButton">non-toggling
     buttons.</a> The default is FALSE (i.e. off).
 <p> <p>See also <a href="#toggleButton-prop">toggleButton</a> and <a href="#toggle">toggle</a>().
-
 <p>Set this property's value with <a href="#setOn">setOn</a>().
-<h3 class=fn><a href="ntqiconset.html">TQIconSet</a> <a name="onIconSet-prop"></a>onIconSet</h3>
-<p>This property holds the icon set that is used when the button is in an "on" state.
-<p><b>This property is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> Since TQt 3.0, <a href="ntqiconset.html">TQIconSet</a> contains both the On and Off icons. There is
-now an <a href="#iconSet-prop">TQToolButton::iconSet</a> property that replaces both <a href="#onIconSet-prop">TQToolButton::onIconSet</a> and <a href="#offIconSet-prop">TQToolButton::offIconSet</a>.
-<p> For ease of porting, this property is a synonym for <a href="#iconSet-prop">TQToolButton::iconSet</a>. You probably want to go over your application
-code and use the TQIconSet On/Off mechanism.
-<p> <p>See also <a href="#iconSet-prop">iconSet</a> and <a href="ntqiconset.html#State-enum">TQIconSet::State</a>.
 
-<p>Set this property's value with <a href="#setOnIconSet">setOnIconSet</a>() and get this property's value with <a href="#onIconSet">onIconSet</a>().
 <h3 class=fn><a href="ntqpixmap.html">TQPixmap</a> <a name="pixmap-prop"></a>pixmap</h3> <p>This property holds the pixmap of the button.
 <p>The pixmap property has no meaning for tool buttons. Use the
 iconSet property instead.
diff --git a/doc/html/porting.html b/doc/html/porting.html
index e095549c0..50f7fb040 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -357,12 +357,12 @@ new code.
 <li> <a href="ntqtabdialog.html#setTabEnabled">TQTabDialog::setTabEnabled</a>( const char *name, bool enable )
 <li> <a href="ntqtextstream.html#TQTextStream">TQTextStream::TQTextStream</a>( TQString &amp; str, int filemode )
 <li> <a href="ntqtoolbar.html#TQToolBar">TQToolBar::TQToolBar</a>( const TQString &amp; label, <a href="ntqmainwindow.html">TQMainWindow</a> *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 )
-<li> <a href="ntqtoolbutton.html#iconSet">TQToolButton::iconSet</a>( bool on ) const
-<li> <a href="ntqtoolbutton.html#offIconSet">TQToolButton::offIconSet</a>() const
-<li> <a href="ntqtoolbutton.html#onIconSet">TQToolButton::onIconSet</a>() const
-<li> <a href="ntqtoolbutton.html#setIconSet">TQToolButton::setIconSet</a>( const <a href="ntqiconset.html">TQIconSet</a> &amp; set, bool on )
-<li> <a href="ntqtoolbutton.html#setOffIconSet">TQToolButton::setOffIconSet</a>( const TQIconSet &amp; )
-<li> <a href="ntqtoolbutton.html#setOnIconSet">TQToolButton::setOnIconSet</a>( const TQIconSet &amp; )
+<li> TQToolButton::iconSet( bool on ) const
+<li> TQToolButton::offIconSet() const
+<li> TQToolButton::onIconSet() const
+<li> TQToolButton::setIconSet( const <a href="ntqiconset.html">TQIconSet</a> &amp; set, bool on )
+<li> TQToolButton::setOffIconSet( const TQIconSet &amp; )
+<li> TQToolButton::setOnIconSet( const TQIconSet &amp; )
 <li> <a href="ntqtooltip.html#enabled">TQToolTip::enabled</a>()
 <li> <a href="ntqtooltip.html#setEnabled">TQToolTip::setEnabled</a>( bool enable )
 <li> <a href="ntqtranslator.html#find">TQTranslator::find</a>( const char *context, const char *sourceText, const char *comment = 0 ) const
@@ -651,29 +651,17 @@ TQtTableView throughout.
 <a name="21"></a><p> The <a href="ntqtoolbutton.html">TQToolButton</a> class used to distinguish between "on" and "off"
 icons. In 3.0, this mechanism was moved into the <a href="ntqiconset.html">TQIconSet</a> class
 (see <a href="ntqiconset.html#State-enum">TQIconSet::State</a>).
-<p> The old <a href="ntqtoolbutton.html#onIconSet-prop">TQToolButton::onIconSet</a> and <a href="ntqtoolbutton.html#offIconSet-prop">TQToolButton::offIconSet</a>
-properties are still provided so that old source will compile, but
-their semantics have changed: they are now synonyms for <a href="ntqtoolbutton.html#iconSet-prop">TQToolButton::iconSet</a>. If you used that distinction in TQt 2.x, you will
-need to adjust your code to use the <a href="ntqiconset.html">TQIconSet</a> On/Off mechanism.
-<p> Likewise, the <em>on</em> parameter of these two functions is now ignored:
+<p> The two TQToolButton::onIconSet and TQToolButton::offIconSet properties
+have been removed, together with the following two functions as well.
 <p> <ul>
 <li> void TQToolButton::setIconSet ( const TQIconSet &amp; set, bool on )
 <li> TQIconSet TQToolButton::iconSet ( bool on ) const
 </ul>
-<p> These functions are only provided for ease of porting. New code
-should use the following instead:
+<p> New code should use the following functions instead:
 <p> <ul>
 <li> void <a href="ntqtoolbutton.html#setIconSet">TQToolButton::setIconSet</a>( const TQIconSet &amp; set )
 <li> TQIconSet <a href="ntqtoolbutton.html#iconSet">TQToolButton::iconSet</a>() const
 </ul>
-<p> Finally, this function is no longer virtual:
-<p> <ul>
-<li> void TQToolButton::setIconSet( const TQIconSet &amp; set, bool on )
-</ul>
-<p> If you have a class that inherits <a href="ntqtoolbutton.html">TQToolButton</a> and that reimplements
-TQToolButton::setIconSet(), you should make the signature of the
-reimplementation agree with the new <a href="ntqtoolbutton.html#setIconSet">TQToolButton::setIconSet</a>(),
-a virtual function.
 <p> <h2> <a href="ntqtextstream.html">TQTextStream</a>
 </h2>
 <a name="22"></a><p> The global TQTextStream manipulators setw(), setfill() and setprecison()
diff --git a/doc/html/propertydocs b/doc/html/propertydocs
index 3ec3818d9..ea60364bd 100644
--- a/doc/html/propertydocs
+++ b/doc/html/propertydocs
@@ -4235,34 +4235,6 @@ pixmap. There is no default iconset.
 </doc>
 </property>
 <property>
-    <name>QToolButton::offIconSet</name>
-    <doc href="ntqtoolbutton.html#offIconSet-prop">
-&lt;p&gt;This property holds the icon set that is used when the button is in an "off" state.
-&lt;p&gt;&lt;b&gt;This property is obsolete.&lt;/b&gt; It is provided to keep old source working. We strongly advise against using it in new code.
-&lt;p&gt; Since TQt 3.0, &lt;a href="ntqiconset.html"&gt;QIconSet&lt;/a&gt; contains both the On and Off icons. There is
-now an &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;QToolButton::iconSet&lt;/a&gt; property that replaces both &lt;a href="ntqtoolbutton.html#onIconSet-prop"&gt;QToolButton::onIconSet&lt;/a&gt; and &lt;a href="ntqtoolbutton.html#offIconSet-prop"&gt;QToolButton::offIconSet&lt;/a&gt;.
-&lt;p&gt; For ease of porting, this property is a synonym for &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;QToolButton::iconSet&lt;/a&gt;. You probably want to go over your application
-code and use the QIconSet On/Off mechanism.
-&lt;p&gt; &lt;p&gt;See also &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;iconSet&lt;/a&gt; and &lt;a href="ntqiconset.html#State-enum"&gt;QIconSet::State&lt;/a&gt;.
-
-&lt;p&gt;Set this property's value with &lt;a href="ntqtoolbutton.html#setOffIconSet"&gt;setOffIconSet&lt;/a&gt;() and get this property's value with &lt;a href="ntqtoolbutton.html#offIconSet"&gt;offIconSet&lt;/a&gt;().
-</doc>
-</property>
-<property>
-    <name>QToolButton::onIconSet</name>
-    <doc href="ntqtoolbutton.html#onIconSet-prop">
-&lt;p&gt;This property holds the icon set that is used when the button is in an "on" state.
-&lt;p&gt;&lt;b&gt;This property is obsolete.&lt;/b&gt; It is provided to keep old source working. We strongly advise against using it in new code.
-&lt;p&gt; Since TQt 3.0, &lt;a href="ntqiconset.html"&gt;QIconSet&lt;/a&gt; contains both the On and Off icons. There is
-now an &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;QToolButton::iconSet&lt;/a&gt; property that replaces both &lt;a href="ntqtoolbutton.html#onIconSet-prop"&gt;QToolButton::onIconSet&lt;/a&gt; and &lt;a href="ntqtoolbutton.html#offIconSet-prop"&gt;QToolButton::offIconSet&lt;/a&gt;.
-&lt;p&gt; For ease of porting, this property is a synonym for &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;QToolButton::iconSet&lt;/a&gt;. You probably want to go over your application
-code and use the QIconSet On/Off mechanism.
-&lt;p&gt; &lt;p&gt;See also &lt;a href="ntqtoolbutton.html#iconSet-prop"&gt;iconSet&lt;/a&gt; and &lt;a href="ntqiconset.html#State-enum"&gt;QIconSet::State&lt;/a&gt;.
-
-&lt;p&gt;Set this property's value with &lt;a href="ntqtoolbutton.html#setOnIconSet"&gt;setOnIconSet&lt;/a&gt;() and get this property's value with &lt;a href="ntqtoolbutton.html#onIconSet"&gt;onIconSet&lt;/a&gt;().
-</doc>
-</property>
-<property>
     <name>QToolButton::popupDelay</name>
     <doc href="ntqtoolbutton.html#popupDelay-prop">
 &lt;p&gt;This property holds the time delay between pressing the button and the appearance of the associated popup menu in milliseconds.
diff --git a/doc/html/propertyindex b/doc/html/propertyindex
index 37bccdb04..a5bd9514b 100644
--- a/doc/html/propertyindex
+++ b/doc/html/propertyindex
@@ -347,8 +347,6 @@
 "QToolBox/currentIndex" ntqtoolbox.html#currentIndex-prop
 "QToolButton/autoRaise" ntqtoolbutton.html#autoRaise-prop
 "QToolButton/iconSet" ntqtoolbutton.html#iconSet-prop
-"QToolButton/offIconSet" ntqtoolbutton.html#offIconSet-prop
-"QToolButton/onIconSet" ntqtoolbutton.html#onIconSet-prop
 "QToolButton/popupDelay" ntqtoolbutton.html#popupDelay-prop
 "QToolButton/textLabel" ntqtoolbutton.html#textLabel-prop
 "QToolButton/textPosition" ntqtoolbutton.html#textPosition-prop
diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html
index 162d2b8ef..9519ee20e 100644
--- a/doc/html/qtoolbutton-h.html
+++ b/doc/html/qtoolbutton-h.html
@@ -96,8 +96,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 )
@@ -130,14 +128,6 @@ public:
     TQSize sizeHint() const;
     TQSize minimumSizeHint() const;
 
-#ifndef TQT_NO_COMPAT
-    void setOnIconSet( const TQIconSet&amp; );
-    void setOffIconSet( const TQIconSet&amp; );
-    void setIconSet( const TQIconSet &amp;, bool on );
-    TQIconSet onIconSet() const;
-    TQIconSet offIconSet( ) const;
-    TQIconSet iconSet( bool on ) const;
-#endif
     virtual void setIconSet( const TQIconSet &amp; );
     TQIconSet iconSet() const;
 
diff --git a/doc/html/qtoolbutton-members.html b/doc/html/qtoolbutton-members.html
index 6fba5deac..f5a593ed8 100644
--- a/doc/html/qtoolbutton-members.html
+++ b/doc/html/qtoolbutton-members.html
@@ -201,8 +201,6 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqobject.html#name">name</a>()
 <li><a href="ntqobject.html#normalizeSignalSlot">normalizeSignalSlot</a>()
 <li><a href="ntqobject.html#objectTrees">objectTrees</a>()
-<li><a href="ntqtoolbutton.html#offIconSet">offIconSet</a>()
-<li><a href="ntqtoolbutton.html#onIconSet">onIconSet</a>()
 <li><a href="ntqtoolbutton.html#openPopup">openPopup</a>()
 <li><a href="ntqwidget.html#ownCursor">ownCursor</a>()
 <li><a href="ntqwidget.html#ownFont">ownFont</a>()
@@ -283,9 +281,7 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqwidget.html#setMinimumWidth">setMinimumWidth</a>()
 <li><a href="ntqwidget.html#setMouseTracking">setMouseTracking</a>()
 <li><a href="ntqobject.html#setName">setName</a>()
-<li><a href="ntqtoolbutton.html#setOffIconSet">setOffIconSet</a>()
 <li><a href="ntqtoolbutton.html#setOn">setOn</a>()
-<li><a href="ntqtoolbutton.html#setOnIconSet">setOnIconSet</a>()
 <li><a href="ntqwidget.html#setPalette">setPalette</a>()
 <li><a href="ntqwidget.html#setPaletteBackgroundColor">setPaletteBackgroundColor</a>()
 <li><a href="ntqwidget.html#setPaletteBackgroundPixmap">setPaletteBackgroundPixmap</a>()
diff --git a/doc/man/man3/tqtoolbutton.3qt b/doc/man/man3/tqtoolbutton.3qt
index aa3477c9d..c7f1e8adb 100644
--- a/doc/man/man3/tqtoolbutton.3qt
+++ b/doc/man/man3/tqtoolbutton.3qt
@@ -31,24 +31,6 @@ Inherits QButton.
 .BI "\fB~QToolButton\fR ()"
 .br
 .ti -1c
-.BI "void setOnIconSet ( const QIconSet & )  \fI(obsolete)\fR"
-.br
-.ti -1c
-.BI "void setOffIconSet ( const QIconSet & )  \fI(obsolete)\fR"
-.br
-.ti -1c
-.BI "void setIconSet ( const QIconSet & set, bool on )  \fI(obsolete)\fR"
-.br
-.ti -1c
-.BI "QIconSet onIconSet () const  \fI(obsolete)\fR"
-.br
-.ti -1c
-.BI "QIconSet offIconSet () const  \fI(obsolete)\fR"
-.br
-.ti -1c
-.BI "QIconSet iconSet ( bool on ) const  \fI(obsolete)\fR"
-.br
-.ti -1c
 .BI "virtual void \fBsetIconSet\fR ( const QIconSet & )"
 .br
 .ti -1c
@@ -127,15 +109,9 @@ Inherits QButton.
 .BI "QIconSet \fBiconSet\fR - the icon set providing the icon shown on the button"
 .br
 .ti -1c
-.BI "QIconSet offIconSet - the icon set that is used when the button is in an ""off"" state  \fI(obsolete)\fR"
-.br
-.ti -1c
 .BI "bool \fBon\fR - whether this tool button is on"
 .br
 .ti -1c
-.BI "QIconSet onIconSet - the icon set that is used when the button is in an ""on"" state  \fI(obsolete)\fR"
-.br
-.ti -1c
 .BI "QPixmap \fBpixmap\fR - the pixmap of the button  \fI(read " "only" ")\fR"
 .br
 .ti -1c
@@ -209,18 +185,6 @@ Destroys the object and frees any allocated resources.
 Returns TRUE if auto-raising is enabled; otherwise returns FALSE. See the "autoRaise" property for details.
 .SH "QIconSet QToolButton::iconSet () const"
 Returns the icon set providing the icon shown on the button. See the "iconSet" property for details.
-.SH "QIconSet QToolButton::iconSet ( bool on ) const"
-This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-.PP
-\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code.
-.PP
-Since TQt 3.0, QIconSet contains both the On and Off icons.
-.PP
-For ease of porting, this function ignores the \fIon\fR parameter and returns the iconSet property. If you relied on the \fIon\fR parameter, you probably want to update your code to use the QIconSet On/Off mechanism.
-.SH "QIconSet QToolButton::offIconSet () const"
-Returns the icon set that is used when the button is in an "off" state. See the "offIconSet" property for details.
-.SH "QIconSet QToolButton::onIconSet () const"
-Returns the icon set that is used when the button is in an "on" state. See the "onIconSet" property for details.
 .SH "void QToolButton::openPopup ()"
 Opens (pops up) the associated popup menu. If there is no such menu, this function does nothing. This function does not return until the popup menu has been closed by the user.
 .SH "QPopupMenu * QToolButton::popup () const"
@@ -233,22 +197,8 @@ Returns the time delay between pressing the button and the appearance of the ass
 Sets whether auto-raising is enabled to \fIenable\fR. See the "autoRaise" property for details.
 .SH "void QToolButton::setIconSet ( const QIconSet & )\fC [virtual]\fR"
 Sets the icon set providing the icon shown on the button. See the "iconSet" property for details.
-.SH "void QToolButton::setIconSet ( const QIconSet & set, bool on )"
-This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-.PP
-\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code.
-.PP
-Since TQt 3.0, QIconSet contains both the On and Off icons.
-.PP
-For ease of porting, this function ignores the \fIon\fR parameter and sets the iconSet property. If you relied on the \fIon\fR parameter, you probably want to update your code to use the QIconSet On/Off mechanism.
-.PP
-See also iconSet and QIconSet::State.
-.SH "void QToolButton::setOffIconSet ( const QIconSet & )"
-Sets the icon set that is used when the button is in an "off" state. See the "offIconSet" property for details.
 .SH "void QToolButton::setOn ( bool enable )\fC [virtual slot]\fR"
 Sets whether this tool button is on to \fIenable\fR. See the "on" property for details.
-.SH "void QToolButton::setOnIconSet ( const QIconSet & )"
-Sets the icon set that is used when the button is in an "on" state. See the "onIconSet" property for details.
 .SH "void QToolButton::setPopup ( QPopupMenu * popup )"
 Associates the popup menu \fIpopup\fR with this tool button.
 .PP
@@ -312,18 +262,6 @@ Setting this property sets QToolButton::pixmap to a null pixmap. There is no def
 See also pixmap, toggleButton, and on.
 .PP
 Set this property's value with setIconSet() and get this property's value with iconSet().
-.SH "QIconSet offIconSet"
-This property holds the icon set that is used when the button is in an "off" state.
-.PP
-\fBThis property is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code.
-.PP
-Since TQt 3.0, QIconSet contains both the On and Off icons. There is now an QToolButton::iconSet property that replaces both QToolButton::onIconSet and QToolButton::offIconSet.
-.PP
-For ease of porting, this property is a synonym for QToolButton::iconSet. You probably want to go over your application code and use the QIconSet On/Off mechanism.
-.PP
-See also iconSet and QIconSet::State.
-.PP
-Set this property's value with setOffIconSet() and get this property's value with offIconSet().
 .SH "bool on"
 This property holds whether this tool button is on.
 .PP
@@ -332,18 +270,6 @@ This property has no effect on non-toggling buttons. The default is FALSE (i.e.
 See also toggleButton and toggle().
 .PP
 Set this property's value with setOn().
-.SH "QIconSet onIconSet"
-This property holds the icon set that is used when the button is in an "on" state.
-.PP
-\fBThis property is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code.
-.PP
-Since TQt 3.0, QIconSet contains both the On and Off icons. There is now an QToolButton::iconSet property that replaces both QToolButton::onIconSet and QToolButton::offIconSet.
-.PP
-For ease of porting, this property is a synonym for QToolButton::iconSet. You probably want to go over your application code and use the QIconSet On/Off mechanism.
-.PP
-See also iconSet and QIconSet::State.
-.PP
-Set this property's value with setOnIconSet() and get this property's value with onIconSet().
 .SH "QPixmap pixmap"
 This property holds the pixmap of the button.
 .PP
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 8d55bbe88..a099d0fef 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -648,40 +648,22 @@ QtTableView throughout.
 
 The \l QToolButton class used to distinguish between "on" and "off"
 icons. In 3.0, this mechanism was moved into the \l QIconSet class
-(see \l QIconSet::State).
-
-The old \l QToolButton::onIconSet and \l QToolButton::offIconSet
-properties are still provided so that old source will compile, but
-their semantics have changed: they are now synonyms for \l
-QToolButton::iconSet. If you used that distinction in TQt 2.x, you will
-need to adjust your code to use the QIconSet On/Off mechanism.
-
-Likewise, the \e on parameter of these two functions is now ignored:
+(see \l QIconSet::State). The two TQToolButton::onIconSet and
+TQToolButton::offIconSet properties have been removed, together with
+the following two functions as well.
 
 \list
 \i void QToolButton::setIconSet ( const QIconSet \& set, bool on )
 \i QIconSet QToolButton::iconSet ( bool on ) const
 \endlist
 
-These functions are only provided for ease of porting. New code
-should use the following instead:
+New code should use the following functions instead:
 
 \list
 \i void QToolButton::setIconSet( const QIconSet \& set )
 \i QIconSet QToolButton::iconSet() const
 \endlist
 
-Finally, this function is no longer virtual:
-
-\list
-\i void QToolButton::setIconSet( const QIconSet \& set, bool on )
-\endlist
-
-If you have a class that inherits QToolButton and that reimplements
-QToolButton::setIconSet(), you should make the signature of the
-reimplementation agree with the new \l QToolButton::setIconSet(),
-a virtual function.
-
 \section1 QTextStream
 
 The global QTextStream manipulators setw(), setfill() and setprecison()
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.