diff options
Diffstat (limited to 'doc/html')
| -rw-r--r-- | doc/html/ntqtoolbutton.html | 57 | ||||
| -rw-r--r-- | doc/html/porting.html | 30 | ||||
| -rw-r--r-- | doc/html/propertydocs | 28 | ||||
| -rw-r--r-- | doc/html/propertyindex | 2 | ||||
| -rw-r--r-- | doc/html/qtoolbutton-h.html | 10 | ||||
| -rw-r--r-- | doc/html/qtoolbutton-members.html | 4 |
6 files changed, 9 insertions, 122 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 TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, TQToolBar * parent, const char * name = 0 )</li> <li class=fn><a href="#TQToolButton-3"><b>TQToolButton</b></a> ( ArrowType type, TQWidget * parent, const char * name = 0 )</li> <li class=fn><a href="#~TQToolButton"><b>~TQToolButton</b></a> ()</li> -<li class=fn>void setOnIconSet ( const TQIconSet & ) <em>(obsolete)</em></li> -<li class=fn>void setOffIconSet ( const TQIconSet & ) <em>(obsolete)</em></li> -<li class=fn>void setIconSet ( const TQIconSet & set, bool on ) <em>(obsolete)</em></li> -<li class=fn>TQIconSet onIconSet () const <em>(obsolete)</em></li> -<li class=fn>TQIconSet offIconSet () const <em>(obsolete)</em></li> -<li class=fn>TQIconSet iconSet ( bool on ) const <em>(obsolete)</em></li> <li class=fn>virtual void <a href="#setIconSet"><b>setIconSet</b></a> ( const TQIconSet & )</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> - whether auto-raising is enabled</li> <li class=fn>BackgroundMode <a href="#backgroundMode-prop"><b>backgroundMode</b></a> - the toolbutton's background mode <em>(read only)</em></li> <li class=fn>TQIconSet <a href="#iconSet-prop"><b>iconSet</b></a> - the icon set providing the icon shown on the button</li> -<li class=fn>TQIconSet offIconSet - the icon set that is used when the button is in an "off" state <em>(obsolete)</em></li> <li class=fn>bool <a href="#on-prop"><b>on</b></a> - whether this tool button is on</li> -<li class=fn>TQIconSet onIconSet - the icon set that is used when the button is in an "on" state <em>(obsolete)</em></li> <li class=fn>TQPixmap <a href="#pixmap-prop"><b>pixmap</b></a> - the pixmap of the button <em>(read only)</em></li> <li class=fn>int <a href="#popupDelay-prop"><b>popupDelay</b></a> - 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> - 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 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 <a href="ntqiconset.html">TQIconSet</a> & )<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 <a href="ntqiconset.html">TQIconSet</a> & set, bool 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 <a href="ntqiconset.html">TQIconSet</a> & ) -</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 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 <a href="ntqiconset.html">TQIconSet</a> & ) -</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> * 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 & str, int filemode ) <li> <a href="ntqtoolbar.html#TQToolBar">TQToolBar::TQToolBar</a>( const TQString & 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> & set, bool on ) -<li> <a href="ntqtoolbutton.html#setOffIconSet">TQToolButton::setOffIconSet</a>( const TQIconSet & ) -<li> <a href="ntqtoolbutton.html#setOnIconSet">TQToolButton::setOnIconSet</a>( const TQIconSet & ) +<li> TQToolButton::iconSet( bool on ) const +<li> TQToolButton::offIconSet() const +<li> TQToolButton::onIconSet() const +<li> TQToolButton::setIconSet( const <a href="ntqiconset.html">TQIconSet</a> & set, bool on ) +<li> TQToolButton::setOffIconSet( const TQIconSet & ) +<li> TQToolButton::setOnIconSet( const TQIconSet & ) <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 & 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 & 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 & 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"> -<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">QIconSet</a> contains both the On and Off icons. There is -now an <a href="ntqtoolbutton.html#iconSet-prop">QToolButton::iconSet</a> property that replaces both <a href="ntqtoolbutton.html#onIconSet-prop">QToolButton::onIconSet</a> and <a href="ntqtoolbutton.html#offIconSet-prop">QToolButton::offIconSet</a>. -<p> For ease of porting, this property is a synonym for <a href="ntqtoolbutton.html#iconSet-prop">QToolButton::iconSet</a>. You probably want to go over your application -code and use the QIconSet On/Off mechanism. -<p> <p>See also <a href="ntqtoolbutton.html#iconSet-prop">iconSet</a> and <a href="ntqiconset.html#State-enum">QIconSet::State</a>. - -<p>Set this property's value with <a href="ntqtoolbutton.html#setOffIconSet">setOffIconSet</a>() and get this property's value with <a href="ntqtoolbutton.html#offIconSet">offIconSet</a>(). -</doc> -</property> -<property> - <name>QToolButton::onIconSet</name> - <doc href="ntqtoolbutton.html#onIconSet-prop"> -<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">QIconSet</a> contains both the On and Off icons. There is -now an <a href="ntqtoolbutton.html#iconSet-prop">QToolButton::iconSet</a> property that replaces both <a href="ntqtoolbutton.html#onIconSet-prop">QToolButton::onIconSet</a> and <a href="ntqtoolbutton.html#offIconSet-prop">QToolButton::offIconSet</a>. -<p> For ease of porting, this property is a synonym for <a href="ntqtoolbutton.html#iconSet-prop">QToolButton::iconSet</a>. You probably want to go over your application -code and use the QIconSet On/Off mechanism. -<p> <p>See also <a href="ntqtoolbutton.html#iconSet-prop">iconSet</a> and <a href="ntqiconset.html#State-enum">QIconSet::State</a>. - -<p>Set this property's value with <a href="ntqtoolbutton.html#setOnIconSet">setOnIconSet</a>() and get this property's value with <a href="ntqtoolbutton.html#onIconSet">onIconSet</a>(). -</doc> -</property> -<property> <name>QToolButton::popupDelay</name> <doc href="ntqtoolbutton.html#popupDelay-prop"> <p>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& ); - 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/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>() |