diff options
| -rw-r--r-- | doc/html/ntqsignal.html | 26 | ||||
| -rw-r--r-- | doc/html/porting.html | 8 | ||||
| -rw-r--r-- | doc/html/qsignal-h.html | 9 | ||||
| -rw-r--r-- | doc/html/qsignal-members.html | 4 | ||||
| -rw-r--r-- | doc/man/man3/tqsignal.3qt | 32 | ||||
| -rw-r--r-- | doc/porting3.doc | 8 | ||||
| -rw-r--r-- | src/kernel/ntqsignal.h | 9 | ||||
| -rw-r--r-- | src/kernel/qsignal.cpp | 35 |
8 files changed, 8 insertions, 123 deletions
diff --git a/doc/html/ntqsignal.html b/doc/html/ntqsignal.html index e57bb471d..67d2d3d39 100644 --- a/doc/html/ntqsignal.html +++ b/doc/html/ntqsignal.html @@ -44,10 +44,6 @@ that don't inherit TQObject. <li class=fn>bool <a href="#connect"><b>connect</b></a> ( const TQObject * receiver, const char * member )</li> <li class=fn>bool <a href="#disconnect"><b>disconnect</b></a> ( const TQObject * receiver, const char * member = 0 )</li> <li class=fn>void <a href="#activate"><b>activate</b></a> ()</li> -<li class=fn>bool isBlocked () const <em>(obsolete)</em></li> -<li class=fn>void block ( bool b ) <em>(obsolete)</em></li> -<li class=fn>void setParameter ( int value ) <em>(obsolete)</em></li> -<li class=fn>int parameter () const <em>(obsolete)</em></li> <li class=fn>void <a href="#setValue"><b>setValue</b></a> ( const TQVariant & value )</li> <li class=fn>TQVariant <a href="#value"><b>value</b></a> () const</li> </ul> @@ -129,14 +125,6 @@ with all TQObjects. parameter has been set with <a href="#setValue">setValue</a>(), this value is passed in the signal. -<h3 class=fn>void <a name="block"></a>TQSignal::block ( bool b ) -</h3> - -<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. -<p> Blocks the signal if <em>b</em> is TRUE, or unblocks the signal if <em>b</em> is FALSE. -<p> An activated signal disappears into hyperspace if it is blocked. -<p> <p>See also <a href="#isBlocked">isBlocked</a>(), <a href="#activate">activate</a>(), and <a href="ntqobject.html#blockSignals">TQObject::blockSignals</a>(). - <h3 class=fn>bool <a name="connect"></a>TQSignal::connect ( const <a href="ntqobject.html">TQObject</a> * receiver, const char * member ) </h3> Connects the signal to <em>member</em> in object <em>receiver</em>. @@ -147,20 +135,6 @@ Connects the signal to <em>member</em> in object <em>receiver</em>. Disonnects the signal from <em>member</em> in object <em>receiver</em>. <p> <p>See also <a href="#connect">connect</a>() and <a href="ntqobject.html#disconnect">TQObject::disconnect</a>(). -<h3 class=fn>bool <a name="isBlocked"></a>TQSignal::isBlocked () const -</h3> - -<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. -<p> Returns TRUE if the signal is blocked, or FALSE if it is not blocked. -<p> The signal is not blocked by default. -<p> <p>See also <a href="#block">block</a>() and <a href="ntqobject.html#signalsBlocked">TQObject::signalsBlocked</a>(). - -<h3 class=fn>int <a name="parameter"></a>TQSignal::parameter () const -</h3> <b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. - -<h3 class=fn>void <a name="setParameter"></a>TQSignal::setParameter ( int value ) -</h3> <b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. - <h3 class=fn>void <a name="setValue"></a>TQSignal::setValue ( const <a href="ntqvariant.html">TQVariant</a> & value ) </h3> Sets the signal's parameter to <em>value</em> diff --git a/doc/html/porting.html b/doc/html/porting.html index ee8cb52b4..3698b9590 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -261,6 +261,10 @@ have been changed: <li> TQPalette::setNormal(). Use TQPalette::setActive instead. <li> TQPointArray::quadBezier() <li> TQRegExp::find() +<li> TQSignal::block(bool b) +<li> TQSignal::isBlocked() const +<li> TQSignal::parameter() const. Use TQSignal::value() instead. +<li> TQSignal::setParameter(int value). Use TQSignal::setValue() instead. <li> TQSpinBox::downButton() <li> TQSpinBox::upButton() <li> TQString::basicDirection() @@ -360,10 +364,6 @@ new code. <li> <a href="ntqregexp.html#match">TQRegExp::match</a>( const TQString & str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const <li> <a href="ntqscrollview.html#childIsVisible">TQScrollView::childIsVisible</a>( TQWidget *child ) <li> <a href="ntqscrollview.html#showChild">TQScrollView::showChild</a>( TQWidget *child, bool show = TRUE ) -<li> <a href="ntqsignal.html#block">TQSignal::block</a>( bool b ) -<li> <a href="ntqsignal.html#isBlocked">TQSignal::isBlocked</a>() const -<li> <a href="ntqsignal.html#parameter">TQSignal::parameter</a>() const -<li> <a href="ntqsignal.html#setParameter">TQSignal::setParameter</a>( int value ) <li> <a href="ntqsimplerichtext.html#draw">TQSimpleRichText::draw</a>( <a href="ntqpainter.html">TQPainter</a> *p, int x, int y, const <a href="ntqregion.html">TQRegion</a> & clipRegion, const <a href="qcolorgroup.html">TQColorGroup</a> & cg, const <a href="ntqbrush.html">TQBrush</a> *paper = 0 ) const <li> <a href="ntqstring.html#ascii">TQString::ascii</a>() const <li> <a href="ntqstring.html#data">TQString::data</a>() const diff --git a/doc/html/qsignal-h.html b/doc/html/qsignal-h.html index f2fd71e50..82e664d5c 100644 --- a/doc/html/qsignal-h.html +++ b/doc/html/qsignal-h.html @@ -96,15 +96,6 @@ public: void activate(); -#ifndef TQT_NO_COMPAT - bool isBlocked() const { return TQObject::signalsBlocked(); } - void block( bool b ) { TQObject::blockSignals( b ); } -#ifndef TQT_NO_VARIANT - void setParameter( int value ); - int parameter() const; -#endif -#endif - #ifndef TQT_NO_VARIANT void setValue( const TQVariant &value ); TQVariant value() const; diff --git a/doc/html/qsignal-members.html b/doc/html/qsignal-members.html index 802459ec9..82b805eb3 100644 --- a/doc/html/qsignal-members.html +++ b/doc/html/qsignal-members.html @@ -38,7 +38,6 @@ body { background: #ffffff; color: black; } <li><a href="ntqsignal.html#TQSignal">TQSignal</a>() <li><a href="ntqsignal.html#~TQSignal">~TQSignal</a>() <li><a href="ntqsignal.html#activate">activate</a>() -<li><a href="ntqsignal.html#block">block</a>() <li><a href="ntqobject.html#blockSignals">blockSignals</a>() <li><a href="ntqobject.html#checkConnectArgs">checkConnectArgs</a>() <li><a href="ntqobject.html#child">child</a>() @@ -61,7 +60,6 @@ body { background: #ffffff; color: black; } <li><a href="ntqobject.html#insertChild">insertChild</a>() <li><a href="ntqobject.html#installEventFilter">installEventFilter</a>() <li><a href="ntqobject.html#isA">isA</a>() -<li><a href="ntqsignal.html#isBlocked">isBlocked</a>() <li><a href="ntqobject.html#isWidgetType">isWidgetType</a>() <li><a href="ntqobject.html#killTimer">killTimer</a>() <li><a href="ntqobject.html#killTimers">killTimers</a>() @@ -69,7 +67,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="ntqsignal.html#parameter">parameter</a>() <li><a href="ntqobject.html#parent">parent</a>() <li><a href="ntqobject.html#property">property</a>() <li><a href="ntqobject.html#queryList">queryList</a>() @@ -77,7 +74,6 @@ body { background: #ffffff; color: black; } <li><a href="ntqobject.html#removeEventFilter">removeEventFilter</a>() <li><a href="ntqobject.html#sender">sender</a>() <li><a href="ntqobject.html#setName">setName</a>() -<li><a href="ntqsignal.html#setParameter">setParameter</a>() <li><a href="ntqobject.html#setProperty">setProperty</a>() <li><a href="ntqsignal.html#setValue">setValue</a>() <li><a href="ntqobject.html#signalsBlocked">signalsBlocked</a>() diff --git a/doc/man/man3/tqsignal.3qt b/doc/man/man3/tqsignal.3qt index 767915703..095283c3c 100644 --- a/doc/man/man3/tqsignal.3qt +++ b/doc/man/man3/tqsignal.3qt @@ -31,18 +31,6 @@ Inherits QObject. .BI "void \fBactivate\fR ()" .br .ti -1c -.BI "bool isBlocked () const \fI(obsolete)\fR" -.br -.ti -1c -.BI "void block ( bool b ) \fI(obsolete)\fR" -.br -.ti -1c -.BI "void setParameter ( int value ) \fI(obsolete)\fR" -.br -.ti -1c -.BI "int parameter () const \fI(obsolete)\fR" -.br -.ti -1c .BI "void \fBsetValue\fR ( const QVariant & value )" .br .ti -1c @@ -138,14 +126,6 @@ Constructs a signal object called \fIname\fR, with the parent object \fIparent\f Destroys the signal. All connections are removed, as is the case with all QObjects. .SH "void QSignal::activate ()" Emits the signal. If the platform supports QVariant and a parameter has been set with setValue(), this value is passed in the signal. -.SH "void QSignal::block ( bool b )" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -Blocks the signal if \fIb\fR is TRUE, or unblocks the signal if \fIb\fR is FALSE. -.PP -An activated signal disappears into hyperspace if it is blocked. -.PP -See also isBlocked(), activate(), and QObject::blockSignals(). .SH "bool QSignal::connect ( const QObject * receiver, const char * member )" Connects the signal to \fImember\fR in object \fIreceiver\fR. .PP @@ -154,18 +134,6 @@ See also disconnect() and QObject::connect(). Disonnects the signal from \fImember\fR in object \fIreceiver\fR. .PP See also connect() and QObject::disconnect(). -.SH "bool QSignal::isBlocked () const" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -Returns TRUE if the signal is blocked, or FALSE if it is not blocked. -.PP -The signal is not blocked by default. -.PP -See also block() and QObject::signalsBlocked(). -.SH "int QSignal::parameter () const" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.SH "void QSignal::setParameter ( int value )" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. .SH "void QSignal::setValue ( const QVariant & value )" Sets the signal's parameter to \fIvalue\fR .SH "QVariant QSignal::value () const" diff --git a/doc/porting3.doc b/doc/porting3.doc index 696919b41..96022918e 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -210,6 +210,10 @@ All these functions have been removed in TQt 3.x: \i QPalette::setNormal(). Use TQPalette::setActive instead. \i QPointArray::quadBezier() \i QRegExp::find() +\i QSignal::block(bool b) +\i QSignal::isBlocked() const +\i QSignal::parameter() const. Use TQSignal::value() instead. +\i QSignal::setParameter(int value). Use TQSignal::setValue() instead. \i QSpinBox::downButton() \i QSpinBox::upButton() \i QString::basicDirection() @@ -313,10 +317,6 @@ new code. \i QRegExp::match( const QString \& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const \i QScrollView::childIsVisible( QWidget *child ) \i QScrollView::showChild( QWidget *child, bool show = TRUE ) -\i QSignal::block( bool b ) -\i QSignal::isBlocked() const -\i QSignal::parameter() const -\i QSignal::setParameter( int value ) \i QSimpleRichText::draw( QPainter *p, int x, int y, const QRegion \& clipRegion, const QColorGroup \& cg, const QBrush *paper = 0 ) const \i QString::ascii() const \i QString::data() const diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h index 55384f3a7..3d482e5b6 100644 --- a/src/kernel/ntqsignal.h +++ b/src/kernel/ntqsignal.h @@ -60,15 +60,6 @@ public: void activate(); -#ifndef TQT_NO_COMPAT - bool isBlocked() const { return TQObject::signalsBlocked(); } - void block( bool b ) { TQObject::blockSignals( b ); } -#ifndef TQT_NO_VARIANT - void setParameter( int value ); - int parameter() const; -#endif -#endif - #ifndef TQT_NO_VARIANT void setValue( const TQVariant &value ); TQVariant value() const; diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp index c26106abb..53b0a62a0 100644 --- a/src/kernel/qsignal.cpp +++ b/src/kernel/qsignal.cpp @@ -176,27 +176,6 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member ) /*! - \fn bool TQSignal::isBlocked() const - \obsolete - Returns TRUE if the signal is blocked, or FALSE if it is not blocked. - - The signal is not blocked by default. - - \sa block(), TQObject::signalsBlocked() -*/ - -/*! - \fn void TQSignal::block( bool b ) - \obsolete - Blocks the signal if \a b is TRUE, or unblocks the signal if \a b is FALSE. - - An activated signal disappears into hyperspace if it is blocked. - - \sa isBlocked(), activate(), TQObject::blockSignals() -*/ - - -/*! \fn void TQSignal::activate() Emits the signal. If the platform supports TQVariant and a @@ -240,18 +219,4 @@ TQVariant TQSignal::value() const /*! \fn void TQSignal::intSignal( int ) \internal */ - -#ifndef TQT_NO_COMPAT -/*! \obsolete */ -void TQSignal::setParameter( int value ) -{ - val = value; -} - -/*! \obsolete */ -int TQSignal::parameter() const -{ - return val.toInt(); -} -#endif #endif //TQT_NO_VARIANT |