diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 19:19:26 -0500 |
commit | 07b6965cbac26077a27faf4071487d9a25fb3aa0 (patch) | |
tree | 8c5910ccfcab2269f7948dbd74a83048cd99d2ac /experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp | |
parent | 1c210202b89d0161f34432bc74157a278670f4dc (diff) | |
download | tde-07b6965cbac26077a27faf4071487d9a25fb3aa0.tar.gz tde-07b6965cbac26077a27faf4071487d9a25fb3aa0.zip |
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp')
-rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp index c9d59d239..3bfdd86fd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp @@ -302,7 +302,7 @@ const TQRect TQWidget::tqgeometry() const { } QSize TQWidget::sizeHint() const { - return sizeHint(); + return tqsizeHint(); } QSize TQWidget::minimumSizeHint() const { @@ -436,7 +436,7 @@ void TQWidget::tqrepaint(const QRegion &rgn, bool) { repaint(rgn); } -TQSizePolicy TQWidget::sizePolicy() const { +TQSizePolicy TQWidget::tqsizePolicy() const { return TQT_TQSIZEPOLICY_OBJECT(sizePolicy()); } @@ -1447,13 +1447,13 @@ TQStyle* TQWidget::setStyle( const TQString &style ) } /*! - \property TQWidget::sizeHint + \property TQWidget::tqsizeHint \brief the recommended size for the widget If the value of this property is an invalid size, no size is recommended. - The default implementation of sizeHint() returns an invalid size + The default implementation of tqsizeHint() returns an invalid size if there is no tqlayout for this widget, and returns the tqlayout's preferred size otherwise. @@ -1461,7 +1461,7 @@ TQStyle* TQWidget::setStyle( const TQString &style ) setMinimumSize(), updateGeometry() */ -TQSize TQWidget::sizeHint() const +TQSize TQWidget::tqsizeHint() const { #ifndef TQT_NO_LAYOUT if ( tqlayout() ) @@ -2624,11 +2624,11 @@ int TQWidget::x11Depth() const { /*! Adjusts the size of the widget to fit the contents. - Uses sizeHint() if valid (i.e if the size hint's width and height + Uses tqsizeHint() if valid (i.e if the size hint's width and height are \>= 0), otherwise sets the size to the tqchildren rectangle (the union of all child widget geometries). - \sa sizeHint(), tqchildrenRect() + \sa tqsizeHint(), tqchildrenRect() */ void TQWidget::adjustSize() @@ -2637,7 +2637,7 @@ void TQWidget::adjustSize() TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); if ( !testWState(WState_Polished) ) polish(); - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); if ( isTopLevel() ) { @@ -2819,7 +2819,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { height(), sizePolicy(), tqsetSizePolicy(), - sizeHint(), + tqsizeHint(), updateGeometry(), tqlayout(), move(), @@ -3091,11 +3091,11 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { \i In the constructor, be sure to set up your member variables early on, before there's any chance that you might receive an event. - \i It is almost always useful to reimplement sizeHint() and to set + \i It is almost always useful to reimplement tqsizeHint() and to set the correct size policy with tqsetSizePolicy(), so users of your class can set up tqlayout management more easily. A size policy lets you supply good defaults for the tqlayout management handling, so that - other widgets can contain and manage yours easily. sizeHint() + other widgets can contain and manage yours easily. tqsizeHint() indicates a "good" size for the widget. \i If your widget is a top-level window, setCaption() and setIcon() set @@ -3205,7 +3205,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { #endif TQSize qt_naturalWidgetSize( TQWidget *w ) { - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); TQ_SPExpandData exp; #ifndef TQT_NO_LAYOUT if ( w->tqlayout() ) { @@ -4911,7 +4911,7 @@ void TQWidget::setMaximumHeight( int h ) Sets both the minimum and maximum width of the widget to \a w without changing the heights. Provided for convenience. - \sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() + \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize() */ void TQWidget::setFixedWidth( int w ) @@ -4925,7 +4925,7 @@ void TQWidget::setFixedWidth( int w ) Sets both the minimum and maximum heights of the widget to \a h without changing the widths. Provided for convenience. - \sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() + \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize() */ void TQWidget::setFixedHeight( int h ) @@ -6895,7 +6895,7 @@ void TQWidget::polish() Ensures that the widget is properly initialized by calling polish(). - Call constPolish() from functions like sizeHint() that depends on + Call constPolish() from functions like tqsizeHint() that depends on the widget being initialized, and that may be called before show(). @@ -7134,11 +7134,11 @@ TQRegion TQWidget::clipRegion() const /*! Adjusts the size of the widget to fit the contents. - Uses sizeHint() if valid (i.e if the size hint's width and height + Uses tqsizeHint() if valid (i.e if the size hint's width and height are \>= 0), otherwise sets the size to the tqchildren rectangle (the union of all child widget geometries). - \sa sizeHint(), tqchildrenRect() + \sa tqsizeHint(), tqchildrenRect() */ void TQWidget::adjustSize() @@ -7147,7 +7147,7 @@ void TQWidget::adjustSize() TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); if ( !testWState(WState_Polished) ) polish(); - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); if ( isTopLevel() ) { @@ -7184,13 +7184,13 @@ void TQWidget::adjustSize() /*! - \property TQWidget::sizeHint + \property TQWidget::tqsizeHint \brief the recommended size for the widget If the value of this property is an invalid size, no size is recommended. - The default implementation of sizeHint() returns an invalid size + The default implementation of tqsizeHint() returns an invalid size if there is no tqlayout for this widget, and returns the tqlayout's preferred size otherwise. @@ -7198,7 +7198,7 @@ void TQWidget::adjustSize() setMinimumSize(), updateGeometry() */ -TQSize TQWidget::sizeHint() const +TQSize TQWidget::tqsizeHint() const { #ifndef TQT_NO_LAYOUT if ( tqlayout() ) @@ -8455,7 +8455,7 @@ void TQWidget::setLayout( TQLayout *l ) The default policy is Preferred/Preferred, which means that the widget can be freely resized, but prefers to be the size - sizeHint() returns. Button-like widgets set the size policy to + tqsizeHint() returns. Button-like widgets set the size policy to specify that they may stretch horizontally, but are fixed vertically. The same applies to lineedit controls (such as TQLineEdit, TQSpinBox or an editable TQComboBox) and other @@ -8466,9 +8466,9 @@ void TQWidget::setLayout( TQLayout *l ) respective direction only. Widgets that can provide scrollbars (usually subclasses of TQScrollView) tend to specify that they can use additional space, and that they can make do with less than - sizeHint(). + tqsizeHint(). - \sa sizeHint() TQLayout TQSizePolicy updateGeometry() + \sa tqsizeHint() TQLayout TQSizePolicy updateGeometry() */ TQSizePolicy TQWidget::sizePolicy() const { @@ -8580,7 +8580,7 @@ TQWidget *TQWidget::tqchildAt( const TQPoint & p, bool includeThis ) const Notifies the tqlayout system that this widget has changed and may need to change tqgeometry. - Call this function if the sizeHint() or sizePolicy() have changed. + Call this function if the tqsizeHint() or sizePolicy() have changed. For explicitly hidden widgets, updateGeometry() is a no-op. The tqlayout system will be notified as soon as the widget is shown. |