TDE
/
experimental
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/experimental
0
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Rename tqsize* to size*"

Browse Source 
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
pull/1/head
Timothy Pearson 14 years ago
parent f01eee0362
commit 33d3ec0635
227 changed files with 849 additions and 849 deletions
Show Stats Download Patch File Download Diff File

20
tqtinterface/qt4/include/tqtglobaldefines.h~
Unescape View File

@ -193,11 +193,11 @@
// #define tqcrossCursor Qt::CrossCursor // #define tqcrossCursor Qt::CrossCursor
// #define tqwaitCursor Qt::WaitCursor // #define tqwaitCursor Qt::WaitCursor
// #define tqibeamCursor Qt::IBeamCursor // #define tqibeamCursor Qt::IBeamCursor
// #define sizeVerCursor Qt::SizeVerCursor // #define tqsizeVerCursor Qt::SizeVerCursor
// #define sizeHorCursor Qt::SizeHorCursor // #define tqsizeHorCursor Qt::SizeHorCursor
// #define sizeBDiagCursor Qt::SizeBDiagCursor // #define tqsizeBDiagCursor Qt::SizeBDiagCursor
// #define sizeFDiagCursor Qt::SizeFDiagCursor // #define tqsizeFDiagCursor Qt::SizeFDiagCursor
// #define sizeAllCursor Qt::SizeAllCursor // #define tqsizeAllCursor Qt::SizeAllCursor
// #define tqblankCursor Qt::BlankCursor // #define tqblankCursor Qt::BlankCursor
// #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitVCursor Qt::SplitVCursor
// #define tqsplitHCursor Qt::SplitHCursor // #define tqsplitHCursor Qt::SplitHCursor
@ -211,11 +211,11 @@
#define tqcrossCursor TQt::crossCursor #define tqcrossCursor TQt::crossCursor
#define tqwaitCursor TQt::waitCursor #define tqwaitCursor TQt::waitCursor
#define tqibeamCursor TQt::ibeamCursor #define tqibeamCursor TQt::ibeamCursor
#define sizeVerCursor TQt::sizeVerCursor #define tqsizeVerCursor TQt::sizeVerCursor
#define sizeHorCursor TQt::sizeHorCursor #define tqsizeHorCursor TQt::sizeHorCursor
#define sizeBDiagCursor TQt::sizeBDiagCursor #define tqsizeBDiagCursor TQt::sizeBDiagCursor
#define sizeFDiagCursor TQt::sizeFDiagCursor #define tqsizeFDiagCursor TQt::sizeFDiagCursor
#define sizeAllCursor TQt::sizeAllCursor #define tqsizeAllCursor TQt::sizeAllCursor
#define tqblankCursor TQt::blankCursor #define tqblankCursor TQt::blankCursor
#define tqsplitVCursor TQt::splitVCursor #define tqsplitVCursor TQt::splitVCursor
#define tqsplitHCursor TQt::splitHCursor #define tqsplitHCursor TQt::splitHCursor

6
tqtinterface/qt4/src/attic/qtmultilineedit.cpp
Unescape View File

@ -3079,7 +3079,7 @@ TQSizePolicy TQtMultiLineEdit::sizePolicy() const
/*\reimp /*\reimp
*/ */
TQSize TQtMultiLineEdit::sizeHint() const TQSize TQtMultiLineEdit::tqsizeHint() const
{ {
constPolish(); constPolish();
int expected_lines; int expected_lines;
@ -3113,9 +3113,9 @@ TQSize TQtMultiLineEdit::tqminimumSizeHint() const
h += frameWidth(); h += frameWidth();
w += frameWidth(); w += frameWidth();
if ( testTableFlags(Tbl_hScrollBar|Tbl_autoHScrollBar) ) if ( testTableFlags(Tbl_hScrollBar|Tbl_autoHScrollBar) )
w += verticalScrollBar()->sizeHint().width(); w += verticalScrollBar()->tqsizeHint().width();
if ( testTableFlags(Tbl_vScrollBar|Tbl_autoVScrollBar) ) if ( testTableFlags(Tbl_vScrollBar|Tbl_autoVScrollBar) )
h += horizontalScrollBar()->sizeHint().height(); h += horizontalScrollBar()->tqsizeHint().height();
return TQSize(w,h); return TQSize(w,h);
} }

2
tqtinterface/qt4/src/attic/qtmultilineedit.h
Unescape View File

@ -58,7 +58,7 @@ public:
TQString textLine( int line ) const; TQString textLine( int line ) const;
int numLines() const; int numLines() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;

8
tqtinterface/qt4/src/attic/qttableview.cpp
Unescape View File

@ -32,8 +32,8 @@ enum ScrollBarDirtyFlags {
}; };
#define HSBEXT horizontalScrollBar()->sizeHint().height() #define HSBEXT horizontalScrollBar()->tqsizeHint().height()
#define VSBEXT verticalScrollBar()->sizeHint().width() #define VSBEXT verticalScrollBar()->tqsizeHint().width()
class TQCornerSquare : public TQWidget // internal class class TQCornerSquare : public TQWidget // internal class
@ -1441,7 +1441,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const
#ifndef TQT_NO_CURSOR #ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor ); sb->setCursor( arrowCursor );
#endif #endif
sb->resize( sb->sizeHint() ); // height is irrelevant sb->resize( sb->tqsizeHint() ); // height is irrelevant
TQ_CHECK_PTR(sb); TQ_CHECK_PTR(sb);
sb->setTracking( FALSE ); sb->setTracking( FALSE );
sb->setFocusPolicy( NoFocus ); sb->setFocusPolicy( NoFocus );
@ -1472,7 +1472,7 @@ TQScrollBar *TQtTableView::horizontalScrollBar() const
#ifndef TQT_NO_CURSOR #ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor ); sb->setCursor( arrowCursor );
#endif #endif
sb->resize( sb->sizeHint() ); // width is irrelevant sb->resize( sb->tqsizeHint() ); // width is irrelevant
sb->setFocusPolicy( NoFocus ); sb->setFocusPolicy( NoFocus );
TQ_CHECK_PTR(sb); TQ_CHECK_PTR(sb);
sb->setTracking( FALSE ); sb->setTracking( FALSE );

4
tqtinterface/qt4/src/canvas/tqcanvas.cpp
Unescape View File

@ -3714,10 +3714,10 @@ void TQCanvasView::drawContents( TQPainter * )
/*! /*!
Suggests a size sufficient to view the entire canvas. Suggests a size sufficient to view the entire canvas.
*/ */
TQSize TQCanvasView::sizeHint() const TQSize TQCanvasView::tqsizeHint() const
{ {
if ( !canvas() ) if ( !canvas() )
return TQScrollView::sizeHint(); return TQScrollView::tqsizeHint();
// should maybe take transformations into account // should maybe take transformations into account
return ( canvas()->size() + 2 * TQSize(frameWidth(), frameWidth()) ) return ( canvas()->size() + 2 * TQSize(frameWidth(), frameWidth()) )
.boundedTo( 3 * TQApplication::desktop()->size() / 4 ); .boundedTo( 3 * TQApplication::desktop()->size() / 4 );

2
tqtinterface/qt4/src/canvas/tqcanvas.h
Unescape View File

@ -382,7 +382,7 @@ public:
protected: protected:
void drawContents( TQPainter*, int cx, int cy, int cw, int ch ); void drawContents( TQPainter*, int cx, int cy, int cw, int ch );
TQSize sizeHint() const; TQSize tqsizeHint() const;
private: private:
void drawContents( TQPainter* ); void drawContents( TQPainter* );

12
tqtinterface/qt4/src/dialogs/tqcolordialog.cpp
Unescape View File

@ -87,7 +87,7 @@ public:
virtual void setCurrent( int row, int col ); virtual void setCurrent( int row, int col );
virtual void setSelected( int row, int col ); virtual void setSelected( int row, int col );
TQSize sizeHint() const; TQSize tqsizeHint() const;
virtual void setCellBrush( int row, int col, const TQBrush & ); virtual void setCellBrush( int row, int col, const TQBrush & );
TQBrush cellBrush( int row, int col ); TQBrush cellBrush( int row, int col );
@ -176,7 +176,7 @@ TQWellArray::TQWellArray( TQWidget *tqparent, const char * name, bool popup )
} }
TQSize TQWellArray::sizeHint() const TQSize TQWellArray::tqsizeHint() const
{ {
constPolish(); constPolish();
TQSize s = gridSize().boundedTo( TQSize(640, 480 ) ); TQSize s = gridSize().boundedTo( TQSize(640, 480 ) );
@ -642,7 +642,7 @@ Q_SIGNALS:
void newCol( int h, int s ); void newCol( int h, int s );
protected: protected:
TQSize sizeHint() const; TQSize tqsizeHint() const;
void drawContents(TQPainter* p); void drawContents(TQPainter* p);
void mouseMoveEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * );
void mousePressEvent( TQMouseEvent * ); void mousePressEvent( TQMouseEvent * );
@ -825,7 +825,7 @@ TQColorPicker::~TQColorPicker()
delete pix; delete pix;
} }
TQSize TQColorPicker::sizeHint() const TQSize TQColorPicker::tqsizeHint() const
{ {
return TQSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() ); return TQSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() );
} }
@ -910,9 +910,9 @@ class TQColNumLineEdit : public TQLineEdit
public: public:
TQColNumLineEdit( TQWidget *tqparent, const char* name=0 ) TQColNumLineEdit( TQWidget *tqparent, const char* name=0 )
: TQLineEdit( tqparent, name ) { setMaxLength( 3 );} : TQLineEdit( tqparent, name ) { setMaxLength( 3 );}
TQSize sizeHint() const { TQSize tqsizeHint() const {
return TQSize( fontMetrics().width( "999" ) + 2 * ( margin() + frameWidth() ), return TQSize( fontMetrics().width( "999" ) + 2 * ( margin() + frameWidth() ),
TQLineEdit::sizeHint().height() ); } TQLineEdit::tqsizeHint().height() ); }
void setNum( int i ) { void setNum( int i ) {
TQString s; TQString s;
s.setNum(i); s.setNum(i);

20
tqtinterface/qt4/src/dialogs/tqdialog.cpp
Unescape View File

@ -48,7 +48,7 @@
#include "tqobjectlist.h" #include "tqobjectlist.h"
#include "tqwidgetlist.h" #include "tqwidgetlist.h"
#include "tqlayout.h" #include "tqlayout.h"
#include "sizegrip.h" #include "tqsizegrip.h"
#include "tqwhatsthis.h" #include "tqwhatsthis.h"
#include "tqpopupmenu.h" #include "tqpopupmenu.h"
#include "tqcursor.h" #include "tqcursor.h"
@ -148,7 +148,7 @@
dialog will initially appear as a partial dialog, but with a dialog will initially appear as a partial dialog, but with a
"More" toggle button. If the user presses the "More" button down, "More" toggle button. If the user presses the "More" button down,
the full dialog will appear. The extension widget will be resized the full dialog will appear. The extension widget will be resized
to its sizeHint(). If orientation is \c Horizontal the extension to its tqsizeHint(). If orientation is \c Horizontal the extension
widget's height() will be expanded to the height() of the dialog. widget's height() will be expanded to the height() of the dialog.
If the orientation is \c Vertical the extension widget's width() If the orientation is \c Vertical the extension widget's width()
will be expanded to the width() of the dialog. Extensibility is will be expanded to the width() of the dialog. Extensibility is
@ -1050,7 +1050,7 @@ void TQDialog::showExtension( bool showIt )
if ( tqlayout() ) if ( tqlayout() )
tqlayout()->setEnabled( FALSE ); tqlayout()->setEnabled( FALSE );
#endif #endif
TQSize s( d->extension->sizeHint() TQSize s( d->extension->tqsizeHint()
.expandedTo( d->extension->tqminimumSize() ) .expandedTo( d->extension->tqminimumSize() )
.boundedTo( d->extension->tqmaximumSize() ) ); .boundedTo( d->extension->tqmaximumSize() ) );
if ( d->orientation == Qt::Horizontal ) { if ( d->orientation == Qt::Horizontal ) {
@ -1078,18 +1078,18 @@ void TQDialog::showExtension( bool showIt )
/*! \reimp */ /*! \reimp */
TQSize TQDialog::sizeHint() const TQSize TQDialog::tqsizeHint() const
{ {
if ( d->extension ) { if ( d->extension ) {
if ( d->orientation == Qt::Horizontal ) if ( d->orientation == Qt::Horizontal )
return TQSize( TQWidget::sizeHint().width(), return TQSize( TQWidget::tqsizeHint().width(),
TQMAX( TQWidget::sizeHint().height(),d->extension->sizeHint().height() ) ); TQMAX( TQWidget::tqsizeHint().height(),d->extension->tqsizeHint().height() ) );
else else
return TQSize( TQMAX( TQWidget::sizeHint().width(), d->extension->sizeHint().width() ), return TQSize( TQMAX( TQWidget::tqsizeHint().width(), d->extension->tqsizeHint().width() ),
TQWidget::sizeHint().height() ); TQWidget::tqsizeHint().height() );
} }
return TQWidget::sizeHint(); return TQWidget::tqsizeHint();
} }
@ -1150,7 +1150,7 @@ void TQDialog::setSizeGripEnabled(bool enabled)
if ( enabled ) { if ( enabled ) {
d->resizer = new TQSizeGrip( this, "TQDialog::resizer" ); d->resizer = new TQSizeGrip( this, "TQDialog::resizer" );
// adjustSize() processes all events, which is suboptimal // adjustSize() processes all events, which is suboptimal
d->resizer->resize( d->resizer->sizeHint() ); d->resizer->resize( d->resizer->tqsizeHint() );
if ( TQApplication::reverseLayout() ) if ( TQApplication::reverseLayout() )
d->resizer->move( rect().bottomLeft() -d->resizer->rect().bottomLeft() ); d->resizer->move( rect().bottomLeft() -d->resizer->rect().bottomLeft() );
else else

2
tqtinterface/qt4/src/dialogs/tqdialog.h
Unescape View File

@ -84,7 +84,7 @@ public:
void setExtension( TQWidget* extension ); void setExtension( TQWidget* extension );
TQWidget* extension() const; TQWidget* extension() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void setSizeGripEnabled( bool ); void setSizeGripEnabled( bool );

4
tqtinterface/qt4/src/dialogs/tqerrormessage.cpp
Unescape View File

@ -63,7 +63,7 @@ public:
: TQTextView( tqparent, name ) { } : TQTextView( tqparent, name ) { }
virtual TQSize tqminimumSizeHint() const; virtual TQSize tqminimumSizeHint() const;
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
}; };
TQSize TQErrorMessageTextView::tqminimumSizeHint() const TQSize TQErrorMessageTextView::tqminimumSizeHint() const
@ -71,7 +71,7 @@ TQSize TQErrorMessageTextView::tqminimumSizeHint() const
return TQSize( 50, 50 ); return TQSize( 50, 50 );
} }
TQSize TQErrorMessageTextView::sizeHint() const TQSize TQErrorMessageTextView::tqsizeHint() const
{ {
return TQSize( 250, 75 ); return TQSize( 250, 75 );
} }

28
tqtinterface/qt4/src/dialogs/tqfiledialog.cpp
Unescape View File

@ -892,7 +892,7 @@ TQFDProgressDialog::TQFDProgressDialog( TQWidget *tqparent, const TQString &fn,
TQPushButton *b = new TQPushButton( TQFileDialog::tr( "Cancel" ), this, TQPushButton *b = new TQPushButton( TQFileDialog::tr( "Cancel" ), this,
"qt_cancel_btn" ); "qt_cancel_btn" );
b->setFixedSize( b->sizeHint() ); b->setFixedSize( b->tqsizeHint() );
tqlayout->addWidget( b ); tqlayout->addWidget( b );
connect( b, TQT_SIGNAL( clicked() ), connect( b, TQT_SIGNAL( clicked() ),
this, TQT_SIGNAL( cancelled() ) ); this, TQT_SIGNAL( cancelled() ) );
@ -1180,7 +1180,7 @@ TQFileListBox::TQFileListBox( TQWidget *tqparent, TQFileDialog *dlg )
TQVBox *box = new TQVBox( viewport(), "qt_vbox" ); TQVBox *box = new TQVBox( viewport(), "qt_vbox" );
box->setFrameStyle( TQFrame::Box | TQFrame::Plain ); box->setFrameStyle( TQFrame::Box | TQFrame::Plain );
lined = new TQRenameEdit( box ); lined = new TQRenameEdit( box );
lined->setFixedHeight( lined->sizeHint().height() ); lined->setFixedHeight( lined->tqsizeHint().height() );
box->hide(); box->hide();
box->setBackgroundMode( TQt::PaletteBase ); box->setBackgroundMode( TQt::PaletteBase );
renameTimer = new TQTimer( this ); renameTimer = new TQTimer( this );
@ -1581,7 +1581,7 @@ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *tqparent, TQFi
TQVBox *box = new TQVBox( viewport(), "qt_vbox" ); TQVBox *box = new TQVBox( viewport(), "qt_vbox" );
box->setFrameStyle( TQFrame::Box | TQFrame::Plain ); box->setFrameStyle( TQFrame::Box | TQFrame::Plain );
lined = new TQRenameEdit( box ); lined = new TQRenameEdit( box );
lined->setFixedHeight( lined->sizeHint().height() ); lined->setFixedHeight( lined->tqsizeHint().height() );
box->hide(); box->hide();
box->setBackgroundMode( TQt::PaletteBase ); box->setBackgroundMode( TQt::PaletteBase );
renameTimer = new TQTimer( this ); renameTimer = new TQTimer( this );
@ -2795,7 +2795,7 @@ void TQFileDialog::init()
if ( screen.width() < 1024 || screen.height() < 768 ) { if ( screen.width() < 1024 || screen.height() < 768 ) {
resize( TQMIN(screen.width(), 420), TQMIN(screen.height(), 236) ); resize( TQMIN(screen.width(), 420), TQMIN(screen.height(), 236) );
} else { } else {
TQSize s = files->sizeHint(); TQSize s = files->tqsizeHint();
s = TQSize( s.width() + 300, s.height() + 82 ); s = TQSize( s.width() + 300, s.height() + 82 );
if ( s.width() * 3 > screen.width() * 2 ) if ( s.width() * 3 > screen.width() * 2 )
@ -3894,20 +3894,20 @@ void TQFileDialog::updateGeometries()
r.setHeight( TQMAX(r.height(),t.height()) ) r.setHeight( TQMAX(r.height(),t.height()) )
// labels first // labels first
r = d->pathL->sizeHint(); r = d->pathL->tqsizeHint();
t = d->fileL->sizeHint(); t = d->fileL->tqsizeHint();
RM; RM;
t = d->typeL->sizeHint(); t = d->typeL->tqsizeHint();
RM; RM;
d->pathL->setFixedSize( d->pathL->sizeHint() ); d->pathL->setFixedSize( d->pathL->tqsizeHint() );
d->fileL->setFixedSize( r ); d->fileL->setFixedSize( r );
d->typeL->setFixedSize( r ); d->typeL->setFixedSize( r );
// single-line input areas // single-line input areas
r = d->paths->sizeHint(); r = d->paths->tqsizeHint();
t = nameEdit->sizeHint(); t = nameEdit->tqsizeHint();
RM; RM;
t = d->types->sizeHint(); t = d->types->tqsizeHint();
RM; RM;
r.setWidth( t.width() * 2 / 3 ); r.setWidth( t.width() * 2 / 3 );
t.setWidth( TQWIDGETSIZE_MAX ); t.setWidth( TQWIDGETSIZE_MAX );
@ -3935,7 +3935,7 @@ r.setHeight( TQMAX(r.height(),t.height()) )
TQButton *b = 0; TQButton *b = 0;
if ( !d->toolButtons.isEmpty() ) { if ( !d->toolButtons.isEmpty() ) {
for ( b = d->toolButtons.first(); b; b = d->toolButtons.next() ) for ( b = d->toolButtons.first(); b; b = d->toolButtons.next() )
b->setFixedSize( b->sizeHint().width(), r.height() ); b->setFixedSize( b->tqsizeHint().width(), r.height() );
} }
if ( d->infoPreview ) { if ( d->infoPreview ) {
@ -3956,9 +3956,9 @@ r.setHeight( TQMAX(r.height(),t.height()) )
// open/save, cancel // open/save, cancel
r = TQSize( 75, 20 ); r = TQSize( 75, 20 );
t = okB->sizeHint(); t = okB->tqsizeHint();
RM; RM;
t = cancelB->sizeHint(); t = cancelB->tqsizeHint();
RM; RM;
okB->setFixedSize( r ); okB->setFixedSize( r );

6
tqtinterface/qt4/src/dialogs/tqfontdialog.cpp
Unescape View File

@ -227,9 +227,9 @@ TQFontDialog::TQFontDialog( TQWidget *tqparent, const char *name,
connect( d->underline, TQT_SIGNAL(clicked()), connect( d->underline, TQT_SIGNAL(clicked()),
TQT_SLOT(updateSample()) ); TQT_SLOT(updateSample()) );
(void)d->familyList->sizeHint(); (void)d->familyList->tqsizeHint();
(void)d->styleList->sizeHint(); (void)d->styleList->tqsizeHint();
(void)d->sizeList->sizeHint(); (void)d->sizeList->tqsizeHint();
for (int i = 0; i < TQFont::NScripts; i++) { for (int i = 0; i < TQFont::NScripts; i++) {
TQString scriptname = TQFontDatabase::scriptName((TQFont::Script) i); TQString scriptname = TQFontDatabase::scriptName((TQFont::Script) i);

6
tqtinterface/qt4/src/dialogs/tqinputdialog.cpp
Unescape View File

@ -152,7 +152,7 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* tqparent,
d->ok->setDefault( TRUE ); d->ok->setDefault( TRUE );
TQPushButton *cancel = new TQPushButton( tr( "Cancel" ), this, "qt_cancel_btn" ); TQPushButton *cancel = new TQPushButton( tr( "Cancel" ), this, "qt_cancel_btn" );
TQSize bs = d->ok->sizeHint().expandedTo( cancel->sizeHint() ); TQSize bs = d->ok->tqsizeHint().expandedTo( cancel->tqsizeHint() );
d->ok->setFixedSize( bs ); d->ok->setFixedSize( bs );
cancel->setFixedSize( bs ); cancel->setFixedSize( bs );
@ -168,7 +168,7 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* tqparent,
connect( d->ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( d->ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
TQSize sh = sizeHint().expandedTo( TQSize(400, 10) ); TQSize sh = tqsizeHint().expandedTo( TQSize(400, 10) );
setType( type ); setType( type );
resize( sh.width(), vbox->heightForWidth(sh.width()) ); resize( sh.width(), vbox->heightForWidth(sh.width()) );
} }
@ -237,7 +237,7 @@ void TQInputDialog::setType( Type t )
} }
if ( input ) { if ( input ) {
d->stack->raiseWidget( input ); d->stack->raiseWidget( input );
d->stack->setFixedHeight( input->sizeHint().height() ); d->stack->setFixedHeight( input->tqsizeHint().height() );
input->setFocus(); input->setFocus();
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
d->label->setBuddy( input ); d->label->setBuddy( input );

2
tqtinterface/qt4/src/dialogs/tqmessagebox.cpp
Unescape View File

@ -1682,7 +1682,7 @@ void TQMessageBox::resizeButtons()
int i; int i;
TQSize maxSize; TQSize maxSize;
for ( i=0; i<mbd->numButtons; i++ ) { for ( i=0; i<mbd->numButtons; i++ ) {
TQSize s = mbd->pb[i]->sizeHint(); TQSize s = mbd->pb[i]->tqsizeHint();
maxSize.setWidth( TQMAX(maxSize.width(), s.width()) ); maxSize.setWidth( TQMAX(maxSize.width(), s.width()) );
maxSize.setHeight( TQMAX(maxSize.height(),s.height()) ); maxSize.setHeight( TQMAX(maxSize.height(),s.height()) );
} }

12
tqtinterface/qt4/src/dialogs/tqprintdialog.cpp
Unescape View File

@ -922,8 +922,8 @@ TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *tqparent, const char *na
cancel->setText( tr("Cancel") ); cancel->setText( tr("Cancel") );
horiz->addWidget( cancel ); horiz->addWidget( cancel );
TQSize s1 = d->ok->sizeHint(); TQSize s1 = d->ok->tqsizeHint();
TQSize s2 = cancel->sizeHint(); TQSize s2 = cancel->tqsizeHint();
s1 = TQSize( TQMAX(s1.width(), s2.width()), s1 = TQSize( TQMAX(s1.width(), s2.width()),
TQMAX(s1.height(), s2.height()) ); TQMAX(s1.height(), s2.height()) );
@ -1139,7 +1139,7 @@ TQGroupBox * TQPrintDialog::setupDestination()
int h = fontMetrics().height(); int h = fontMetrics().height();
if ( d->printers->firstChild() ) if ( d->printers->firstChild() )
h = d->printers->firstChild()->height(); h = d->printers->firstChild()->height();
d->printers->setMinimumSize( d->printers->sizeHint().width(), d->printers->setMinimumSize( d->printers->tqsizeHint().width(),
d->printers->header()->height() + d->printers->header()->height() +
3 * h ); 3 * h );
horiz->addWidget( d->printers, 3 ); horiz->addWidget( d->printers, 3 );
@ -1271,9 +1271,9 @@ TQGroupBox * TQPrintDialog::setupOptions()
connect( d->copies, TQT_SIGNAL(valueChanged(int)), connect( d->copies, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(setNumCopies(int)) ); this, TQT_SLOT(setNumCopies(int)) );
TQSize s = d->firstPageLabel->sizeHint() TQSize s = d->firstPageLabel->tqsizeHint()
.expandedTo( d->lastPageLabel->sizeHint() ) .expandedTo( d->lastPageLabel->tqsizeHint() )
.expandedTo( l->sizeHint() ); .expandedTo( l->tqsizeHint() );
d->firstPageLabel->setMinimumSize( s ); d->firstPageLabel->setMinimumSize( s );
d->lastPageLabel->setMinimumSize( s ); d->lastPageLabel->setMinimumSize( s );
l->setMinimumSize( s.width() + 19, s.height() ); l->setMinimumSize( s.width() + 19, s.height() );

40
tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
Unescape View File

@ -358,8 +358,8 @@ void TQProgressDialog::setLabel( TQLabel *label )
label->reparent( this, 0, TQPoint(0,0), FALSE ); label->reparent( this, 0, TQPoint(0,0), FALSE );
} }
} }
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
if (label) if (label)
label->show(); label->show();
@ -384,8 +384,8 @@ void TQProgressDialog::setLabelText( const TQString &text )
{ {
if ( label() ) { if ( label() ) {
label()->setText( text ); label()->setText( text );
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
} }
} }
@ -417,8 +417,8 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton )
d->cancel, TQT_SIGNAL(clicked()) ); d->cancel, TQT_SIGNAL(clicked()) );
#endif #endif
} }
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
if (cancelButton) if (cancelButton)
cancelButton->show(); cancelButton->show();
@ -439,8 +439,8 @@ void TQProgressDialog::setCancelButtonText( const TQString &cancelButtonText )
} else { } else {
setCancelButton(0); setCancelButton(0);
} }
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
} }
@ -462,8 +462,8 @@ void TQProgressDialog::setBar( TQProgressBar *bar )
} }
delete d->bar; delete d->bar;
d->bar = bar; d->bar = bar;
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
} }
@ -610,8 +610,8 @@ void TQProgressDialog::setProgress( int progress )
} }
} }
if ( need_show ) { if ( need_show ) {
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
show(); show();
d->shown_once = TRUE; d->shown_once = TRUE;
@ -647,13 +647,13 @@ void TQProgressDialog::setProgress( int progress, int totalSteps )
need to call this yourself. need to call this yourself.
*/ */
TQSize TQProgressDialog::sizeHint() const TQSize TQProgressDialog::tqsizeHint() const
{ {
TQSize sh = label()->sizeHint(); TQSize sh = label()->tqsizeHint();
TQSize bh = bar()->sizeHint(); TQSize bh = bar()->tqsizeHint();
int h = margin_tb*2 + bh.height() + sh.height() + spacing; int h = margin_tb*2 + bh.height() + sh.height() + spacing;
if ( d->cancel ) if ( d->cancel )
h += d->cancel->sizeHint().height() + spacing; h += d->cancel->tqsizeHint().height() + spacing;
return TQSize( TQMAX(200, sh.width() + 2*margin_lr), h ); return TQSize( TQMAX(200, sh.width() + 2*margin_lr), h );
} }
@ -681,8 +681,8 @@ void TQProgressDialog::tqlayout()
const bool centered = const bool centered =
bool(tqstyle().tqstyleHint(TQStyle::SH_ProgressDialog_CenterCancelButton, this)); bool(tqstyle().tqstyleHint(TQStyle::SH_ProgressDialog_CenterCancelButton, this));
TQSize cs = d->cancel ? d->cancel->sizeHint() : TQSize(0,0); TQSize cs = d->cancel ? d->cancel->tqsizeHint() : TQSize(0,0);
TQSize bh = bar()->sizeHint(); TQSize bh = bar()->tqsizeHint();
int cspc; int cspc;
int lh = 0; int lh = 0;
@ -800,8 +800,8 @@ bool TQProgressDialog::autoClose() const
void TQProgressDialog::showEvent( TQShowEvent *e ) void TQProgressDialog::showEvent( TQShowEvent *e )
{ {
TQDialog::showEvent( e ); TQDialog::showEvent( e );
int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h ); resize( w, h );
forceTimer->stop(); forceTimer->stop();
} }

2
tqtinterface/qt4/src/dialogs/tqprogressdialog.h
Unescape View File

@ -85,7 +85,7 @@ public:
int totalSteps() const; int totalSteps() const;
int progress() const; int progress() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQString labelText() const; TQString labelText() const;

10
tqtinterface/qt4/src/dialogs/tqtabdialog.cpp
Unescape View File

@ -936,7 +936,7 @@ void TQTabDialog::setSizes()
int bh = s.height(); int bh = s.height();
if ( d->ok ) { if ( d->ok ) {
s = d->ok->sizeHint(); s = d->ok->tqsizeHint();
if ( s.width() > bw ) if ( s.width() > bw )
bw = s.width(); bw = s.width();
if ( s.height() > bh ) if ( s.height() > bh )
@ -944,7 +944,7 @@ void TQTabDialog::setSizes()
} }
if ( d->ab ) { if ( d->ab ) {
s = d->ab->sizeHint(); s = d->ab->tqsizeHint();
if ( s.width() > bw ) if ( s.width() > bw )
bw = s.width(); bw = s.width();
if ( s.height() > bh ) if ( s.height() > bh )
@ -952,7 +952,7 @@ void TQTabDialog::setSizes()
} }
if ( d->db ) { if ( d->db ) {
s = d->db->sizeHint(); s = d->db->tqsizeHint();
if ( s.width() > bw ) if ( s.width() > bw )
bw = s.width(); bw = s.width();
if ( s.height() > bh ) if ( s.height() > bh )
@ -960,7 +960,7 @@ void TQTabDialog::setSizes()
} }
if ( d->hb ) { if ( d->hb ) {
s = d->hb->sizeHint(); s = d->hb->tqsizeHint();
if ( s.width() > bw ) if ( s.width() > bw )
bw = s.width(); bw = s.width();
if ( s.height() > bh ) if ( s.height() > bh )
@ -968,7 +968,7 @@ void TQTabDialog::setSizes()
} }
if ( d->cb ) { if ( d->cb ) {
s = d->cb->sizeHint(); s = d->cb->tqsizeHint();
if ( s.width() > bw ) if ( s.width() > bw )
bw = s.width(); bw = s.width();
if ( s.height() > bh ) if ( s.height() > bh )

4
tqtinterface/qt4/src/iconview/tqiconview.cpp
Unescape View File

@ -6011,12 +6011,12 @@ void TQIconView::sort( bool ascending )
\reimp \reimp
*/ */
TQSize TQIconView::sizeHint() const TQSize TQIconView::tqsizeHint() const
{ {
constPolish(); constPolish();
if ( !d->firstItem ) if ( !d->firstItem )
return TQScrollView::sizeHint(); return TQScrollView::tqsizeHint();
if ( d->dirty && d->firstSizeHint ) { if ( d->dirty && d->firstSizeHint ) {
( (TQIconView*)this )->resizeContents( TQMAX( 400, contentsWidth() ), ( (TQIconView*)this )->resizeContents( TQMAX( 400, contentsWidth() ),

2
tqtinterface/qt4/src/iconview/tqiconview.h
Unescape View File

@ -386,7 +386,7 @@ public:
bool eventFilter( TQObject * o, TQEvent * ); bool eventFilter( TQObject * o, TQEvent * );
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
virtual void sort( bool ascending = TRUE ); virtual void sort( bool ascending = TRUE );

6
tqtinterface/qt4/src/kernel/qt_kernel.pri
Unescape View File

@ -72,8 +72,8 @@ kernel {
$$KERNEL_H/tqsignalmapper.h \ $$KERNEL_H/tqsignalmapper.h \
$$KERNEL_H/tqsignalslotimp.h \ $$KERNEL_H/tqsignalslotimp.h \
$$KERNEL_H/tqsize.h \ $$KERNEL_H/tqsize.h \
$$KERNEL_H/sizegrip.h \ $$KERNEL_H/tqsizegrip.h \
$$KERNEL_H/sizepolicy.h \ $$KERNEL_H/tqsizepolicy.h \
$$KERNEL_H/tqsocketnotifier.h \ $$KERNEL_H/tqsocketnotifier.h \
$$KERNEL_H/tqsound.h \ $$KERNEL_H/tqsound.h \
$$KERNEL_H/tqstyle.h \ $$KERNEL_H/tqstyle.h \
@ -222,7 +222,7 @@ kernel {
$$KERNEL_CPP/tqsignal.cpp \ $$KERNEL_CPP/tqsignal.cpp \
$$KERNEL_CPP/tqsignalmapper.cpp \ $$KERNEL_CPP/tqsignalmapper.cpp \
$$KERNEL_CPP/tqsize.cpp \ $$KERNEL_CPP/tqsize.cpp \
$$KERNEL_CPP/sizegrip.cpp \ $$KERNEL_CPP/tqsizegrip.cpp \
$$KERNEL_CPP/tqstyle.cpp \ $$KERNEL_CPP/tqstyle.cpp \
$$KERNEL_CPP/tqsocketnotifier.cpp \ $$KERNEL_CPP/tqsocketnotifier.cpp \
$$KERNEL_CPP/tqsound.cpp \ $$KERNEL_CPP/tqsound.cpp \

72
tqtinterface/qt4/src/kernel/tqabstractlayout.cpp
Unescape View File

@ -55,7 +55,7 @@
layouts. layouts.
If \a b is TRUE, margin handling needs to be implemented in If \a b is TRUE, margin handling needs to be implemented in
setGeometry(), tqmaximumSize(), tqminimumSize(), sizeHint() and setGeometry(), tqmaximumSize(), tqminimumSize(), tqsizeHint() and
heightForWidth(). heightForWidth().
\sa supportsMargin() \sa supportsMargin()
@ -100,7 +100,7 @@ static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
This is used by custom layouts. This is used by custom layouts.
Pure virtual functions are provided to return information about Pure virtual functions are provided to return information about
the tqlayout, including, sizeHint(), tqminimumSize(), tqmaximumSize() the tqlayout, including, tqsizeHint(), tqminimumSize(), tqmaximumSize()
and expandingDirections(). and expandingDirections().
The tqlayout's tqgeometry can be set and retrieved with setGeometry() The tqlayout's tqgeometry can be set and retrieved with setGeometry()
@ -173,7 +173,7 @@ static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
*/ */
/*! /*!
\fn TQSize TQLayoutItem::sizeHint() const \fn TQSize TQLayoutItem::tqsizeHint() const
Implemented in subclasses to return the preferred size of this item. Implemented in subclasses to return the preferred size of this item.
*/ */
@ -403,7 +403,7 @@ void TQWidgetItem::setGeometry( const TQRect &r )
int x = r.x(); int x = r.x();
int y = r.y(); int y = r.y();
if ( align & (TQt::AlignHorizontal_Mask | TQt::AlignVertical_Mask) ) { if ( align & (TQt::AlignHorizontal_Mask | TQt::AlignVertical_Mask) ) {
TQSize pref = wid->sizeHint().expandedTo( wid->tqminimumSize() ); //### TQSize pref = wid->tqsizeHint().expandedTo( wid->tqminimumSize() ); //###
if ( align & TQt::AlignHorizontal_Mask ) if ( align & TQt::AlignHorizontal_Mask )
s.setWidth( TQMIN( s.width(), pref.width() ) ); s.setWidth( TQMIN( s.width(), pref.width() ) );
if ( align & TQt::AlignVertical_Mask ) { if ( align & TQt::AlignVertical_Mask ) {
@ -535,7 +535,7 @@ TQ_SPExpandData TQSpacerItem::expandingDirections() const
/*! /*!
Returns whether this item's widget can make use of more space than Returns whether this item's widget can make use of more space than
sizeHint(). A value of \c Vertical or \c Horizontal means that it wants tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions and \c NoDirection means that it wants to grow in both dimensions and \c NoDirection means that
it doesn't want to grow at all. it doesn't want to grow at all.
@ -657,7 +657,7 @@ TQSize TQWidgetItem::tqmaximumSize() const
/*! /*!
Returns the preferred size of this spacer item. Returns the preferred size of this spacer item.
*/ */
TQSize TQSpacerItem::sizeHint() const TQSize TQSpacerItem::tqsizeHint() const
{ {
return QSpacerItem::sizeHint(); return QSpacerItem::sizeHint();
} }
@ -668,7 +668,7 @@ TQSize TQSpacerItem::sizeHint() const
/*! /*!
Returns the preferred size of this spacer item. Returns the preferred size of this spacer item.
*/ */
TQSize TQSpacerItem::sizeHint() const TQSize TQSpacerItem::tqsizeHint() const
{ {
return TQSize( width, height ); return TQSize( width, height );
} }
@ -678,13 +678,13 @@ TQSize TQSpacerItem::sizeHint() const
/*! /*!
Returns the preferred size of this item. Returns the preferred size of this item.
*/ */
TQSize TQWidgetItem::sizeHint() const TQSize TQWidgetItem::tqsizeHint() const
{ {
TQSize s; TQSize s;
if ( isEmpty() ) { if ( isEmpty() ) {
s = TQSize( 0, 0 ); s = TQSize( 0, 0 );
} else { } else {
s = wid->sizeHint(); s = wid->tqsizeHint();
if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).horData() == TQSizePolicy::Ignored ) if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).horData() == TQSizePolicy::Ignored )
s.setWidth( 1 ); s.setWidth( 1 );
if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).verData() == TQSizePolicy::Ignored ) if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).verData() == TQSizePolicy::Ignored )
@ -732,7 +732,7 @@ bool TQWidgetItem::isEmpty() const
overview page \endlink for more information. overview page \endlink for more information.
To make your own tqlayout manager, subclass TQGLayoutIterator and To make your own tqlayout manager, subclass TQGLayoutIterator and
implement the functions addItem(), sizeHint(), setGeometry(), and implement the functions addItem(), tqsizeHint(), setGeometry(), and
iterator(). You should also implement tqminimumSize() to ensure your iterator(). You should also implement tqminimumSize() to ensure your
tqlayout isn't resized to zero size if there is too little space. To tqlayout isn't resized to zero size if there is too little space. To
support tqchildren whose heights depend on their widths, implement support tqchildren whose heights depend on their widths, implement
@ -1145,7 +1145,7 @@ TQSize TQLayout::totalSizeHint() const
} }
int b = ( topLevel && !marginImpl ) ? 2 * outsideBorder : 0; int b = ( topLevel && !marginImpl ) ? 2 * outsideBorder : 0;
TQSize s = sizeHint(); TQSize s = tqsizeHint();
if ( hasHeightForWidth() ) if ( hasHeightForWidth() )
s.setHeight( heightForWidth(s.width()) ); s.setHeight( heightForWidth(s.width()) );
int h = b; int h = b;
@ -1303,7 +1303,7 @@ TQSize TQLayout::tqmaximumSize() const
/*! /*!
Returns whether this tqlayout can make use of more space than Returns whether this tqlayout can make use of more space than
sizeHint(). A value of \c Vertical or \c Horizontal means that it wants tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions. it wants to grow in both dimensions.
@ -1390,7 +1390,7 @@ bool TQLayout::activate()
if (ms.isValid()) if (ms.isValid())
mw->setMinimumSize( ms ); mw->setMinimumSize( ms );
// ideally only if sizeHint() or sizePolicy() has changed // ideally only if tqsizeHint() or sizePolicy() has changed
mw->updateGeometry(); mw->updateGeometry();
return TRUE; return TRUE;
} }
@ -1421,7 +1421,7 @@ bool TQLayout::activate()
The horizontal and vertical \l{SizeType}s are set in the usual constructor The horizontal and vertical \l{SizeType}s are set in the usual constructor
and can be queried using a variety of functions. and can be queried using a variety of functions.
The hasHeightForWidth() flag indicates whether the widget's sizeHint() The hasHeightForWidth() flag indicates whether the widget's tqsizeHint()
is width-dependent (such as a word-wrapping label) or not. is width-dependent (such as a word-wrapping label) or not.
\sa TQSizePolicy::SizeType \sa TQSizePolicy::SizeType
@ -1433,35 +1433,35 @@ bool TQLayout::activate()
The per-dimension sizing types used when constructing a The per-dimension sizing types used when constructing a
TQSizePolicy are: TQSizePolicy are:
\value Fixed The TQWidget::sizeHint() is the only acceptable \value Fixed The TQWidget::tqsizeHint() is the only acceptable
alternative, so the widget can never grow or shrink (e.g. the alternative, so the widget can never grow or shrink (e.g. the
vertical direction of a push button). vertical direction of a push button).
\value Minimum The sizeHint() is minimal, and sufficient. The \value Minimum The tqsizeHint() is minimal, and sufficient. The
widget can be expanded, but there is no advantage to it being widget can be expanded, but there is no advantage to it being
larger (e.g. the horizontal direction of a push button). larger (e.g. the horizontal direction of a push button).
It cannot be smaller than the size provided by sizeHint(). It cannot be smaller than the size provided by tqsizeHint().
\value Maximum The sizeHint() is a maximum. The widget can be \value Maximum The tqsizeHint() is a maximum. The widget can be
shrunk any amount without detriment if other widgets need the shrunk any amount without detriment if other widgets need the
space (e.g. a separator line). space (e.g. a separator line).
It cannot be larger than the size provided by sizeHint(). It cannot be larger than the size provided by tqsizeHint().
\value Preferred The sizeHint() is best, but the widget can be \value Preferred The tqsizeHint() is best, but the widget can be
shrunk and still be useful. The widget can be expanded, but there shrunk and still be useful. The widget can be expanded, but there
is no advantage to it being larger than sizeHint() (the default is no advantage to it being larger than tqsizeHint() (the default
TQWidget policy). TQWidget policy).
\value Expanding The sizeHint() is a sensible size, but the \value Expanding The tqsizeHint() is a sensible size, but the
widget can be shrunk and still be useful. The widget can make use widget can be shrunk and still be useful. The widget can make use
of extra space, so it should get as much space as possible (e.g. of extra space, so it should get as much space as possible (e.g.
the horizontal direction of a slider). the horizontal direction of a slider).
\value MinimumExpanding The sizeHint() is minimal, and sufficient. \value MinimumExpanding The tqsizeHint() is minimal, and sufficient.
The widget can make use of extra space, so it should get as much The widget can make use of extra space, so it should get as much
space as possible (e.g. the horizontal direction of a slider). space as possible (e.g. the horizontal direction of a slider).
\value Ignored the sizeHint() is ignored. The widget will get as \value Ignored the tqsizeHint() is ignored. The widget will get as
much space as possible. much space as possible.
*/ */
@ -1475,13 +1475,13 @@ bool TQLayout::activate()
any direction. any direction.
\value Horizontally the widget can usefully be wider than the \value Horizontally the widget can usefully be wider than the
sizeHint(). tqsizeHint().
\value Vertically the widget can usefully be taller than the \value Vertically the widget can usefully be taller than the
sizeHint(). tqsizeHint().
\value BothDirections the widget can usefully be both wider and \value BothDirections the widget can usefully be both wider and
taller than the sizeHint(). taller than the tqsizeHint().
*/ */
/*! /*!
@ -1543,7 +1543,7 @@ bool TQLayout::activate()
\fn bool TQSizePolicy::mayShrinkHorizontally() const \fn bool TQSizePolicy::mayShrinkHorizontally() const
Returns TRUE if the widget can sensibly be narrower than its Returns TRUE if the widget can sensibly be narrower than its
sizeHint(); otherwise returns FALSE. tqsizeHint(); otherwise returns FALSE.
\sa mayShrinkVertically() mayGrowHorizontally() \sa mayShrinkVertically() mayGrowHorizontally()
*/ */
@ -1552,7 +1552,7 @@ bool TQLayout::activate()
\fn bool TQSizePolicy::mayShrinkVertically() const \fn bool TQSizePolicy::mayShrinkVertically() const
Returns TRUE if the widget can sensibly be shorter than its Returns TRUE if the widget can sensibly be shorter than its
sizeHint(); otherwise returns FALSE. tqsizeHint(); otherwise returns FALSE.
\sa mayShrinkHorizontally() mayGrowVertically() \sa mayShrinkHorizontally() mayGrowVertically()
*/ */
@ -1561,7 +1561,7 @@ bool TQLayout::activate()
\fn bool TQSizePolicy::mayGrowHorizontally() const \fn bool TQSizePolicy::mayGrowHorizontally() const
Returns TRUE if the widget can sensibly be wider than its Returns TRUE if the widget can sensibly be wider than its
sizeHint(); otherwise returns FALSE. tqsizeHint(); otherwise returns FALSE.
\sa mayGrowVertically() mayShrinkHorizontally() \sa mayGrowVertically() mayShrinkHorizontally()
*/ */
@ -1570,7 +1570,7 @@ bool TQLayout::activate()
\fn bool TQSizePolicy::mayGrowVertically() const \fn bool TQSizePolicy::mayGrowVertically() const
Returns TRUE if the widget can sensibly be taller than its Returns TRUE if the widget can sensibly be taller than its
sizeHint(); otherwise returns FALSE. tqsizeHint(); otherwise returns FALSE.
\sa mayGrowHorizontally() mayShrinkVertically() \sa mayGrowHorizontally() mayShrinkVertically()
*/ */
@ -1579,7 +1579,7 @@ bool TQLayout::activate()
\fn TQ_SPExpandData TQSizePolicy::expandingDirections() const \fn TQ_SPExpandData TQSizePolicy::expandingDirections() const
Returns whether this tqlayout can make use of more space than Returns whether this tqlayout can make use of more space than
sizeHint(). A value of \c Vertical or \c Horizontal means that it wants tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions. it wants to grow in both dimensions.
@ -1847,7 +1847,7 @@ TQGLayoutIterator::~TQGLayoutIterator()
height-for-width (hasHeightForWidth()), this is height-for-width (hasHeightForWidth()), this is
the same as \c Minimium; otherwise, this is the the same as \c Minimium; otherwise, this is the
same as \c FreeResize. same as \c FreeResize.
\value Fixed The main widget's size is set to sizeHint(); it \value Fixed The main widget's size is set to tqsizeHint(); it
cannot be resized at all. cannot be resized at all.
\value Minimum The main widget's minimum size is set to \value Minimum The main widget's minimum size is set to
tqminimumSize(); it cannot be smaller. tqminimumSize(); it cannot be smaller.
@ -1953,7 +1953,7 @@ void TQLayout::setAutoAdd( bool b )
layouts. layouts.
If \a b is TRUE, margin handling needs to be implemented in If \a b is TRUE, margin handling needs to be implemented in
setGeometry(), tqmaximumSize(), tqminimumSize(), sizeHint() and setGeometry(), tqmaximumSize(), tqminimumSize(), tqsizeHint() and
heightForWidth(). heightForWidth().
\sa supportsMargin() \sa supportsMargin()
@ -1968,12 +1968,12 @@ void TQLayout::setSupportsMargin( bool b )
this tqlayout is set to \a r, provided that this tqlayout supports this tqlayout is set to \a r, provided that this tqlayout supports
tqsetAlignment(). tqsetAlignment().
The result is derived from sizeHint() and expandingDirections(). It is never The result is derived from tqsizeHint() and expandingDirections(). It is never
larger than \a r. larger than \a r.
*/ */
TQRect TQLayout::alignmentRect( const TQRect &r ) const TQRect TQLayout::alignmentRect( const TQRect &r ) const
{ {
TQSize s = sizeHint(); TQSize s = tqsizeHint();
int a = tqalignment(); int a = tqalignment();
/* /*

2
tqtinterface/qt4/src/kernel/tqapplication.cpp
Unescape View File

@ -2480,7 +2480,7 @@ void TQApplication::setColorSpec( int spec )
Example: Example:
\code \code
TQSize& WidgetClass::sizeHint() const TQSize& WidgetClass::tqsizeHint() const
{ {
return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() ); return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() );
} }

2
tqtinterface/qt4/src/kernel/tqapplication.cpp~
Unescape View File

@ -2480,7 +2480,7 @@ void TQApplication::setColorSpec( int spec )
Example: Example:
\code \code
TQSize& WidgetClass::sizeHint() const TQSize& WidgetClass::tqsizeHint() const
{ {
return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() ); return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() );
} }

86
tqtinterface/qt4/src/kernel/tqlayout.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "tqwidget.h" #include "tqwidget.h"
#include "tqmenubar.h" #include "tqmenubar.h"
#include "tqptrlist.h" #include "tqptrlist.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqlayoutengine_p.h" #include "tqlayoutengine_p.h"
@ -98,7 +98,7 @@ TQLayout *TQLayout::tqlayout() {
return this; return this;
} }
TQSize TQLayout::sizeHint() const { TQSize TQLayout::tqsizeHint() const {
return sizeHint(); return sizeHint();
} }
@ -1451,7 +1451,7 @@ public:
{ item_ = TQT_TQLAYOUTITEM(new TQSpacerItem( w, h, hData, vData )); } { item_ = TQT_TQLAYOUTITEM(new TQSpacerItem( w, h, hData, vData )); }
~TQGridBox() { delete item_; } ~TQGridBox() { delete item_; }
QSize sizeHint() const { return item_->sizeHint(); } QSize tqsizeHint() const { return item_->sizeHint(); }
QSize tqminimumSize() const { return item_->minimumSize(); } QSize tqminimumSize() const { return item_->minimumSize(); }
QSize tqmaximumSize() const { return item_->maximumSize(); } QSize tqmaximumSize() const { return item_->maximumSize(); }
TQ_SPExpandData expandingDirections() const { return item_->expandingDirections(); } TQ_SPExpandData expandingDirections() const { return item_->expandingDirections(); }
@ -1505,7 +1505,7 @@ public:
void add( TQGridBox*, int row, int col ); void add( TQGridBox*, int row, int col );
void add( TQGridBox*, int row1, int row2, int col1, int col2 ); void add( TQGridBox*, int row1, int row2, int col1, int col2 );
QSize sizeHint( int ) const; QSize tqsizeHint( int ) const;
QSize tqminimumSize( int ) const; QSize tqminimumSize( int ) const;
QSize tqmaximumSize( int ) const; QSize tqmaximumSize( int ) const;
@ -1650,7 +1650,7 @@ void TQGridLayoutData::recalcHFW( int w, int spacing )
int mh = 0; int mh = 0;
int n = 0; int n = 0;
for ( int r = 0; r < rr; r++ ) { for ( int r = 0; r < rr; r++ ) {
h += rData[r].sizeHint; h += rData[r].tqsizeHint;
mh += rData[r].tqminimumSize; mh += rData[r].tqminimumSize;
if ( !rData[r].empty ) if ( !rData[r].empty )
n++; n++;
@ -1765,9 +1765,9 @@ TQ_SPExpandData TQGridLayoutData::expanding( int spacing )
return (TQ_SPExpandData) ret; return (TQ_SPExpandData) ret;
} }
QSize TQGridLayoutData::sizeHint( int spacer ) const QSize TQGridLayoutData::tqsizeHint( int spacer ) const
{ {
return tqfindSize( &TQLayoutStruct::sizeHint, spacer ); return tqfindSize( &TQLayoutStruct::tqsizeHint, spacer );
} }
QSize TQGridLayoutData::tqmaximumSize( int spacer ) const QSize TQGridLayoutData::tqmaximumSize( int spacer ) const
@ -1878,7 +1878,7 @@ void TQGridLayoutData::add( TQGridBox *box, int row1, int row2, int col1,
void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c ) void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
{ {
TQSize hint = box->sizeHint(); TQSize hint = box->tqsizeHint();
TQSize minS = box->tqminimumSize(); TQSize minS = box->tqminimumSize();
TQSize maxS = box->tqmaximumSize(); TQSize maxS = box->tqmaximumSize();
@ -1886,8 +1886,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
if ( !cStretch[box->col] ) if ( !cStretch[box->col] )
colData[box->col].stretch = TQMAX( colData[box->col].stretch, colData[box->col].stretch = TQMAX( colData[box->col].stretch,
box->hStretch() ); box->hStretch() );
colData[box->col].sizeHint = TQMAX( hint.width(), colData[box->col].tqsizeHint = TQMAX( hint.width(),
colData[box->col].sizeHint ); colData[box->col].tqsizeHint );
colData[box->col].tqminimumSize = TQMAX( minS.width(), colData[box->col].tqminimumSize = TQMAX( minS.width(),
colData[box->col].tqminimumSize ); colData[box->col].tqminimumSize );
@ -1899,8 +1899,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
if ( !rStretch[box->row] ) if ( !rStretch[box->row] )
rowData[box->row].stretch = TQMAX( rowData[box->row].stretch, rowData[box->row].stretch = TQMAX( rowData[box->row].stretch,
box->vStretch() ); box->vStretch() );
rowData[box->row].sizeHint = TQMAX( hint.height(), rowData[box->row].tqsizeHint = TQMAX( hint.height(),
rowData[box->row].sizeHint ); rowData[box->row].tqsizeHint );
rowData[box->row].tqminimumSize = TQMAX( minS.height(), rowData[box->row].tqminimumSize = TQMAX( minS.height(),
rowData[box->row].tqminimumSize ); rowData[box->row].tqminimumSize );
@ -1935,7 +1935,7 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c )
static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing, static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
int start, int end, int start, int end,
int minSize, int sizeHint, int minSize, int tqsizeHint,
TQMemArray<int> &stretchArray, int stretch ) TQMemArray<int> &stretchArray, int stretch )
{ {
int i; int i;
@ -1944,7 +1944,7 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
int max = 0; int max = 0;
for ( i = start; i <= end; i++ ) { for ( i = start; i <= end; i++ ) {
w += chain[i].tqminimumSize; w += chain[i].tqminimumSize;
wh += chain[i].sizeHint; wh += chain[i].tqsizeHint;
max += chain[i].tqmaximumSize; max += chain[i].tqmaximumSize;
chain[i].empty = FALSE; chain[i].empty = FALSE;
if ( stretchArray[i] == 0 ) if ( stretchArray[i] == 0 )
@ -1983,11 +1983,11 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing,
} }
} }
if ( wh < sizeHint ) { if ( wh < tqsizeHint ) {
qGeomCalc( chain, start, end - start + 1, 0, sizeHint, spacing ); qGeomCalc( chain, start, end - start + 1, 0, tqsizeHint, spacing );
for ( i = start; i <= end; i++ ) { for ( i = start; i <= end; i++ ) {
if ( chain[i].sizeHint < chain[i].size ) if ( chain[i].tqsizeHint < chain[i].size )
chain[i].sizeHint = chain[i].size; chain[i].tqsizeHint = chain[i].size;
} }
} }
} }
@ -2031,7 +2031,7 @@ void TQGridLayoutData::setupLayoutData( int spacing )
if ( c2 < 0 ) if ( c2 < 0 )
c2 = cc - 1; c2 = cc - 1;
TQSize hint = box->sizeHint(); TQSize hint = box->tqsizeHint();
TQSize min = box->tqminimumSize(); TQSize min = box->tqminimumSize();
if ( box->hasHeightForWidth() ) if ( box->hasHeightForWidth() )
has_hfw = TRUE; has_hfw = TRUE;
@ -2065,13 +2065,13 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width )
TQMemArray<TQLayoutStruct> &rData = *hfwData; TQMemArray<TQLayoutStruct> &rData = *hfwData;
if ( box->hasHeightForWidth() ) { if ( box->hasHeightForWidth() ) {
int hint = box->heightForWidth( width ); int hint = box->heightForWidth( width );
rData[box->row].sizeHint = TQMAX( hint, rData[box->row].sizeHint ); rData[box->row].tqsizeHint = TQMAX( hint, rData[box->row].tqsizeHint );
rData[box->row].tqminimumSize = TQMAX( hint, rData[box->row].tqminimumSize ); rData[box->row].tqminimumSize = TQMAX( hint, rData[box->row].tqminimumSize );
} else { } else {
TQSize hint = box->sizeHint(); TQSize hint = box->tqsizeHint();
TQSize minS = box->tqminimumSize(); TQSize minS = box->tqminimumSize();
rData[box->row].sizeHint = TQMAX( hint.height(), rData[box->row].tqsizeHint = TQMAX( hint.height(),
rData[box->row].sizeHint ); rData[box->row].tqsizeHint );
rData[box->row].tqminimumSize = TQMAX( minS.height(), rData[box->row].tqminimumSize = TQMAX( minS.height(),
rData[box->row].tqminimumSize ); rData[box->row].tqminimumSize );
} }
@ -2079,7 +2079,7 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width )
/* /*
Similar to setupLayoutData(), but uses heightForWidth(colData) Similar to setupLayoutData(), but uses heightForWidth(colData)
instead of sizeHint(). Assumes that setupLayoutData() and instead of tqsizeHint(). Assumes that setupLayoutData() and
qGeomCalc(colData) has been called. qGeomCalc(colData) has been called.
*/ */
void TQGridLayoutData::setupHfwLayoutData( int spacing ) void TQGridLayoutData::setupHfwLayoutData( int spacing )
@ -2088,7 +2088,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing )
int i; int i;
for ( i = 0; i < rr; i++ ) { for ( i = 0; i < rr; i++ ) {
rData[i] = rowData[i]; rData[i] = rowData[i];
rData[i].tqminimumSize = rData[i].sizeHint = 0; rData[i].tqminimumSize = rData[i].tqsizeHint = 0;
} }
TQPtrListIterator<TQGridBox> it( things ); TQPtrListIterator<TQGridBox> it( things );
TQGridBox * box; TQGridBox * box;
@ -2114,7 +2114,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing )
if ( r1 == r2 ) { if ( r1 == r2 ) {
addHfwData( box, w ); addHfwData( box, w );
} else { } else {
TQSize hint = box->sizeHint(); TQSize hint = box->tqsizeHint();
TQSize min = box->tqminimumSize(); TQSize min = box->tqminimumSize();
if ( box->hasHeightForWidth() ) { if ( box->hasHeightForWidth() ) {
int hfwh = box->heightForWidth( w ); int hfwh = box->heightForWidth( w );
@ -2465,9 +2465,9 @@ int TQGridLayout::numCols() const
/*! /*!
Returns the preferred size of this grid. Returns the preferred size of this grid.
*/ */
TQSize TQGridLayout::sizeHint() const TQSize TQGridLayout::tqsizeHint() const
{ {
return data->sizeHint( spacing() ) + TQSize( 2 * margin(), 2 * margin() ); return data->tqsizeHint( spacing() ) + TQSize( 2 * margin(), 2 * margin() );
} }
/*! /*!
@ -2641,7 +2641,7 @@ void TQGridLayout::addMultiCell( QLayoutItem *item, int fromRow, int toRow,
\i From TQt 3.0, the \a tqalignment parameter is interpreted more \i From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill tqalignment now indicates that the widget should not grow to fill
the available space, but should be sized according to sizeHint(). the available space, but should be sized according to tqsizeHint().
\endlist \endlist
\sa addMultiCellWidget() \sa addMultiCellWidget()
@ -2673,7 +2673,7 @@ void TQGridLayout::addWidget( TQWidget *w, int row, int col, int tqalignment )
A non-zero tqalignment indicates that the widget should not grow to A non-zero tqalignment indicates that the widget should not grow to
fill the available space but should be sized according to fill the available space but should be sized according to
sizeHint(). tqsizeHint().
\sa addWidget() \sa addWidget()
*/ */
@ -2714,7 +2714,7 @@ void TQGridLayout::addLayout( TQLayout *tqlayout, int row, int col )
A non-zero tqalignment indicates that the tqlayout should not grow to A non-zero tqalignment indicates that the tqlayout should not grow to
fill the available space but should be sized according to fill the available space but should be sized according to
sizeHint(). tqsizeHint().
\a tqlayout becomes a child of the grid tqlayout. \a tqlayout becomes a child of the grid tqlayout.
@ -2858,7 +2858,7 @@ int TQGridLayout::colSpacing( int col ) const
/*! /*!
Returns whether this tqlayout can make use of more space than Returns whether this tqlayout can make use of more space than
sizeHint(). A value of \c Vertical or \c Horizontal means that it wants tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions. it wants to grow in both dimensions.
*/ */
@ -2998,7 +2998,7 @@ public:
int hfwWidth; int hfwWidth;
int hfwHeight; int hfwHeight;
int hfwMinHeight; int hfwMinHeight;
TQSize sizeHint; TQSize tqsizeHint;
TQSize minSize; TQSize minSize;
TQSize maxSize; TQSize maxSize;
TQ_SPExpandData expanding; TQ_SPExpandData expanding;
@ -3206,13 +3206,13 @@ TQBoxLayout::~TQBoxLayout()
/*! /*!
Returns the preferred size of this box tqlayout. Returns the preferred size of this box tqlayout.
*/ */
TQSize TQBoxLayout::sizeHint() const TQSize TQBoxLayout::tqsizeHint() const
{ {
if ( data->dirty ) { if ( data->dirty ) {
TQBoxLayout *that = (TQBoxLayout*)this; TQBoxLayout *that = (TQBoxLayout*)this;
that->setupGeom(); that->setupGeom();
} }
return data->sizeHint + TQSize( 2 * margin(), 2 * margin() ); return data->tqsizeHint + TQSize( 2 * margin(), 2 * margin() );
} }
/*! /*!
@ -3328,7 +3328,7 @@ TQLayoutItem* TQBoxLayout::takeAt(int index) {
/*! /*!
Returns whether this tqlayout can make use of more space than Returns whether this tqlayout can make use of more space than
sizeHint(). A value of \c Vertical or \c Horizontal means that it wants tqsizeHint(). A value of \c Vertical or \c Horizontal means that it wants
to grow in only one dimension, whereas \c BothDirections means that to grow in only one dimension, whereas \c BothDirections means that
it wants to grow in both dimensions. it wants to grow in both dimensions.
*/ */
@ -3362,7 +3362,7 @@ void TQBoxLayout::setGeometry( const TQRect &r )
for ( int i = 0; i < n; i++ ) { for ( int i = 0; i < n; i++ ) {
TQBoxLayoutItem *box = data->list.at( i ); TQBoxLayoutItem *box = data->list.at( i );
if ( box->item->hasHeightForWidth() ) if ( box->item->hasHeightForWidth() )
a[i].sizeHint = a[i].tqminimumSize = a[i].tqsizeHint = a[i].tqminimumSize =
box->item->heightForWidth( s.width() ); box->item->heightForWidth( s.width() );
} }
} }
@ -3528,7 +3528,7 @@ void TQBoxLayout::insertLayout( int index, TQLayout *tqlayout, int stretch )
From TQt 3.0, the \a tqalignment parameter is interpreted more From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill tqalignment now indicates that the widget should not grow to fill
the available space, but should be sized according to sizeHint(). the available space, but should be sized according to tqsizeHint().
\sa setAutoAdd(), insertLayout(), insertSpacing() \sa setAutoAdd(), insertLayout(), insertSpacing()
*/ */
@ -3592,7 +3592,7 @@ void TQBoxLayout::addStretch( int stretch )
From TQt 3.0, the \a tqalignment parameter is interpreted more From TQt 3.0, the \a tqalignment parameter is interpreted more
aggressively than in previous versions of TQt. A non-default aggressively than in previous versions of TQt. A non-default
tqalignment now indicates that the widget should not grow to fill tqalignment now indicates that the widget should not grow to fill
the available space, but should be sized according to sizeHint(). the available space, but should be sized according to tqsizeHint().
\sa insertWidget(), setAutoAdd(), addLayout(), addSpacing() \sa insertWidget(), setAutoAdd(), addLayout(), addSpacing()
*/ */
@ -3717,7 +3717,7 @@ void TQBoxLayout::setDirection( Direction direction )
if ( sp ) { if ( sp ) {
if ( sp->expandingDirections() == TQSizePolicy::NoDirection ) { if ( sp->expandingDirections() == TQSizePolicy::NoDirection ) {
//spacing or strut //spacing or strut
TQSize s = sp->sizeHint(); TQSize s = sp->tqsizeHint();
sp->changeSize( s.height(), s.width(), sp->changeSize( s.height(), s.width(),
horz(direction) ? TQSizePolicy::Fixed:TQSizePolicy::Minimum, horz(direction) ? TQSizePolicy::Fixed:TQSizePolicy::Minimum,
horz(direction) ? TQSizePolicy::Minimum:TQSizePolicy::Fixed ); horz(direction) ? TQSizePolicy::Minimum:TQSizePolicy::Fixed );
@ -3795,7 +3795,7 @@ void TQBoxLayout::setupGeom()
minh = TQMAX( minh, min.height() ); minh = TQMAX( minh, min.height() );
hinth = TQMAX( hinth, hint.height() ); hinth = TQMAX( hinth, hint.height() );
a[i].sizeHint = hint.width(); a[i].tqsizeHint = hint.width();
a[i].tqmaximumSize = max.width(); a[i].tqmaximumSize = max.width();
a[i].tqminimumSize = min.width(); a[i].tqminimumSize = min.width();
a[i].expansive = expand; a[i].expansive = expand;
@ -3812,7 +3812,7 @@ void TQBoxLayout::setupGeom()
minw = TQMAX( minw, min.width() ); minw = TQMAX( minw, min.width() );
hintw = TQMAX( hintw, hint.width() ); hintw = TQMAX( hintw, hint.width() );
a[i].sizeHint = hint.height(); a[i].tqsizeHint = hint.height();
a[i].tqmaximumSize = max.height(); a[i].tqmaximumSize = max.height();
a[i].tqminimumSize = min.height(); a[i].tqminimumSize = min.height();
a[i].expansive = expand; a[i].expansive = expand;
@ -3831,7 +3831,7 @@ void TQBoxLayout::setupGeom()
( (horexp ? TQSizePolicy::Horizontally : 0) ( (horexp ? TQSizePolicy::Horizontally : 0)
| (verexp ? TQSizePolicy::Vertically : 0) ); | (verexp ? TQSizePolicy::Vertically : 0) );
data->sizeHint = TQSize( hintw, hinth ) data->tqsizeHint = TQSize( hintw, hinth )
.expandedTo( data->minSize ) .expandedTo( data->minSize )
.boundedTo( data->maxSize ); .boundedTo( data->maxSize );

32
tqtinterface/qt4/src/kernel/tqlayout.h
Unescape View File

@ -52,7 +52,7 @@
#ifndef TQT_H #ifndef TQT_H
#include "tqobject.h" #include "tqobject.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqwidget.h" #include "tqwidget.h"
#endif // TQT_H #endif // TQT_H
@ -170,7 +170,7 @@ public:
virtual inline void tqinvalidate() { QLayoutItem::invalidate(); } virtual inline void tqinvalidate() { QLayoutItem::invalidate(); }
virtual inline void invalidate() { tqinvalidate(); } virtual inline void invalidate() { tqinvalidate(); }
// inline virtual TQSize sizeHint() const { return QLayoutItem::sizeHint(); } // inline virtual TQSize tqsizeHint() const { return QLayoutItem::sizeHint(); }
// inline virtual TQSize tqminimumSize() const { return QLayoutItem::minimumSize(); } // inline virtual TQSize tqminimumSize() const { return QLayoutItem::minimumSize(); }
// inline virtual TQSize tqmaximumSize() const { return QLayoutItem::maximumSize(); } // inline virtual TQSize tqmaximumSize() const { return QLayoutItem::maximumSize(); }
// inline virtual void setGeometry( const TQRect&r ) { QLayoutItem::setGeometry(r); } // inline virtual void setGeometry( const TQRect&r ) { QLayoutItem::setGeometry(r); }
@ -178,7 +178,7 @@ public:
// inline virtual TQ_SPExpandData expandingDirections() const { return QLayoutItem::expandingDirections(); } // inline virtual TQ_SPExpandData expandingDirections() const { return QLayoutItem::expandingDirections(); }
// These functions are pure virtual in Qt4 // These functions are pure virtual in Qt4
inline TQSize sizeHint() const { return sizeHint(); } inline TQSize tqsizeHint() const { return sizeHint(); }
inline TQSize tqminimumSize() const { return minimumSize(); } inline TQSize tqminimumSize() const { return minimumSize(); }
inline TQSize tqmaximumSize() const { return maximumSize(); } inline TQSize tqmaximumSize() const { return maximumSize(); }
// inline void setGeometry( const TQRect&r ) { TQ_UNUSED(r); } // inline void setGeometry( const TQRect&r ) { TQ_UNUSED(r); }
@ -189,7 +189,7 @@ public:
// This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below.
// This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead.
#define QLAYOUTITEM_REQUIRED_FUNCTIONS \ #define QLAYOUTITEM_REQUIRED_FUNCTIONS \
virtual inline QSize sizeHint() const { return sizeHint(); } \ virtual inline QSize sizeHint() const { return tqsizeHint(); } \
virtual inline QSize minimumSize() const { return tqminimumSize(); } \ virtual inline QSize minimumSize() const { return tqminimumSize(); } \
virtual inline QSize maximumSize() const { return tqmaximumSize(); } \ virtual inline QSize maximumSize() const { return tqmaximumSize(); } \
virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \
@ -211,7 +211,7 @@ public:
// virtual int heightForWidth( int ) const; // virtual int heightForWidth( int ) const;
// virtual TQLayoutIterator iterator(); // virtual TQLayoutIterator iterator();
// //
// virtual TQSize sizeHint() const = 0; // virtual TQSize tqsizeHint() const = 0;
// virtual TQSize tqminimumSize() const = 0; // virtual TQSize tqminimumSize() const = 0;
// virtual TQSize tqmaximumSize() const = 0; // virtual TQSize tqmaximumSize() const = 0;
// virtual void setGeometry( const TQRect& ) = 0; // virtual void setGeometry( const TQRect& ) = 0;
@ -223,7 +223,7 @@ public:
// // Use the TQt virtual functions, not the built in Qt ones... // // Use the TQt virtual functions, not the built in Qt ones...
// // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below.
// // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. // // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead.
// inline QSize sizeHint() const { return sizeHint(); } // inline QSize sizeHint() const { return tqsizeHint(); }
// inline QSize minimumSize() const { return tqminimumSize(); } // inline QSize minimumSize() const { return tqminimumSize(); }
// inline QSize maximumSize() const { return tqmaximumSize(); } // inline QSize maximumSize() const { return tqmaximumSize(); }
// inline void setGeometry( const QRect &r ) { return TQLayoutItem::setGeometry( r ); } // inline void setGeometry( const QRect &r ) { return TQLayoutItem::setGeometry( r ); }
@ -240,7 +240,7 @@ class TQ_EXPORT TQLayoutItem
public: public:
TQLayoutItem( int tqalignment = 0 ) : align( tqalignment ) { } TQLayoutItem( int tqalignment = 0 ) : align( tqalignment ) { }
virtual ~TQLayoutItem(); virtual ~TQLayoutItem();
virtual TQSize sizeHint() const = 0; virtual TQSize tqsizeHint() const = 0;
virtual TQSize tqminimumSize() const = 0; virtual TQSize tqminimumSize() const = 0;
virtual TQSize tqmaximumSize() const = 0; virtual TQSize tqmaximumSize() const = 0;
virtual TQ_SPExpandData expandingDirections() const = 0; virtual TQ_SPExpandData expandingDirections() const = 0;
@ -278,7 +278,7 @@ public:
TQ_SPExpandData expandingDirections() const; // Used by tqabstractlayout.cpp TQ_SPExpandData expandingDirections() const; // Used by tqabstractlayout.cpp
bool isEmpty() const; // Used by tqabstractlayout.cpp bool isEmpty() const; // Used by tqabstractlayout.cpp
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqmaximumSize() const; TQSize tqmaximumSize() const;
void setGeometry( const TQRect &qr ); void setGeometry( const TQRect &qr );
@ -287,7 +287,7 @@ public:
// Use the TQt virtual functions, not the built in Qt ones... // Use the TQt virtual functions, not the built in Qt ones...
// This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below.
// This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead.
inline QSize sizeHint() const { return sizeHint(); } inline QSize sizeHint() const { return tqsizeHint(); }
inline QSize minimumSize() const { return tqminimumSize(); } inline QSize minimumSize() const { return tqminimumSize(); }
inline QSize maximumSize() const { return tqmaximumSize(); } inline QSize maximumSize() const { return tqmaximumSize(); }
inline void setGeometry( const QRect &r ) { return TQSpacerItem::setGeometry( TQT_TQRECT_OBJECT(r) ); } inline void setGeometry( const QRect &r ) { return TQSpacerItem::setGeometry( TQT_TQRECT_OBJECT(r) ); }
@ -306,7 +306,7 @@ public:
void changeSize( int w, int h, void changeSize( int w, int h,
TQSizePolicy::SizeType hData = TQSizePolicy::Minimum, TQSizePolicy::SizeType hData = TQSizePolicy::Minimum,
TQSizePolicy::SizeType vData = TQSizePolicy::Minimum ); TQSizePolicy::SizeType vData = TQSizePolicy::Minimum );
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqmaximumSize() const; TQSize tqmaximumSize() const;
TQ_SPExpandData expandingDirections() const; TQ_SPExpandData expandingDirections() const;
@ -328,7 +328,7 @@ class TQ_EXPORT TQWidgetItem : public TQLayoutItem
{ {
public: public:
TQWidgetItem( TQWidget *w ) : wid( w ) { } TQWidgetItem( TQWidget *w ) : wid( w ) { }
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqmaximumSize() const; TQSize tqmaximumSize() const;
TQ_SPExpandData expandingDirections() const; TQ_SPExpandData expandingDirections() const;
@ -369,7 +369,7 @@ public:
virtual TQ_SPExpandData expandingDirections() const; virtual TQ_SPExpandData expandingDirections() const;
TQLayout *tqlayout(); TQLayout *tqlayout();
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSize() const; virtual TQSize tqminimumSize() const;
virtual TQSize tqmaximumSize() const; virtual TQSize tqmaximumSize() const;
@ -652,7 +652,7 @@ inline void TQLayoutIterator::deleteCurrent()
int count() const; \ int count() const; \
TQLayoutItem* itemAt(int index) const; \ TQLayoutItem* itemAt(int index) const; \
TQLayoutItem* takeAt(int index); \ TQLayoutItem* takeAt(int index); \
virtual inline QSize sizeHint() const { return sizeHint(); } \ virtual inline QSize sizeHint() const { return tqsizeHint(); } \
virtual inline QSize minimumSize() const { return tqminimumSize(); } \ virtual inline QSize minimumSize() const { return tqminimumSize(); } \
virtual inline QSize maximumSize() const { return tqmaximumSize(); } \ virtual inline QSize maximumSize() const { return tqmaximumSize(); } \
virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \
@ -720,7 +720,7 @@ public:
delete hack; delete hack;
} }
inline TQSize sizeHint() const { return sizeHint(); } inline TQSize tqsizeHint() const { return sizeHint(); }
inline TQSize tqminimumSize() const { return minimumSize(); } inline TQSize tqminimumSize() const { return minimumSize(); }
inline TQSize tqmaximumSize() const { return maximumSize(); } inline TQSize tqmaximumSize() const { return maximumSize(); }
inline void tqinvalidate() { invalidate(); } inline void tqinvalidate() { invalidate(); }
@ -956,7 +956,7 @@ public:
int spacing = -1, const char *name = 0 ); int spacing = -1, const char *name = 0 );
~TQGridLayout(); ~TQGridLayout();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqmaximumSize() const; TQSize tqmaximumSize() const;
@ -1064,7 +1064,7 @@ public:
bool setStretchFactor( TQWidget*, int stretch ); bool setStretchFactor( TQWidget*, int stretch );
bool setStretchFactor( TQLayout *l, int stretch ); bool setStretchFactor( TQLayout *l, int stretch );
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqmaximumSize() const; TQSize tqmaximumSize() const;

8
tqtinterface/qt4/src/kernel/tqlayoutengine.cpp
Unescape View File

@ -256,7 +256,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i )
if ( TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayShrinkHorizontally() ) { if ( TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayShrinkHorizontally() ) {
s.setWidth( w->tqminimumSizeHint().width() ); s.setWidth( w->tqminimumSizeHint().width() );
} else { } else {
sh = w->sizeHint(); sh = w->tqsizeHint();
s.setWidth( sh.width() ); s.setWidth( sh.width() );
} }
} }
@ -266,7 +266,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i )
s.setHeight( w->tqminimumSizeHint().height() ); s.setHeight( w->tqminimumSizeHint().height() );
} else { } else {
s.setHeight( sh.isValid() ? sh.height() s.setHeight( sh.isValid() ? sh.height()
: w->sizeHint().height() ); : w->tqsizeHint().height() );
} }
} }
} }
@ -298,11 +298,11 @@ TQ_EXPORT TQSize tqSmartMaxSize( const TQWidgetItem *i, int align )
TQSize s = w->tqmaximumSize(); TQSize s = w->tqmaximumSize();
if ( s.width() == TQWIDGETSIZE_MAX && !(align & TQt::AlignHorizontal_Mask) ) if ( s.width() == TQWIDGETSIZE_MAX && !(align & TQt::AlignHorizontal_Mask) )
if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowHorizontally() ) if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowHorizontally() )
s.setWidth( w->sizeHint().width() ); s.setWidth( w->tqsizeHint().width() );
if ( s.height() == TQWIDGETSIZE_MAX && !(align & TQt::AlignVertical_Mask) ) if ( s.height() == TQWIDGETSIZE_MAX && !(align & TQt::AlignVertical_Mask) )
if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowVertically() ) if ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowVertically() )
s.setHeight( w->sizeHint().height() ); s.setHeight( w->tqsizeHint().height() );
s = s.expandedTo( w->tqminimumSize() ); s = s.expandedTo( w->tqminimumSize() );

6
tqtinterface/qt4/src/kernel/tqlayoutengine_p.h
Unescape View File

@ -69,19 +69,19 @@ struct TQLayoutStruct
{ {
inline void init( int stretchFactor = 0, int spacing = 0 ) { inline void init( int stretchFactor = 0, int spacing = 0 ) {
stretch = stretchFactor; stretch = stretchFactor;
tqminimumSize = sizeHint = spacing; tqminimumSize = tqsizeHint = spacing;
tqmaximumSize = TQLAYOUTSIZE_MAX; tqmaximumSize = TQLAYOUTSIZE_MAX;
expansive = FALSE; expansive = FALSE;
empty = TRUE; empty = TRUE;
} }
TQCOORD smartSizeHint() { TQCOORD smartSizeHint() {
return ( stretch > 0 ) ? tqminimumSize : sizeHint; return ( stretch > 0 ) ? tqminimumSize : tqsizeHint;
} }
// parameters // parameters
int stretch; int stretch;
TQCOORD sizeHint; TQCOORD tqsizeHint;
TQCOORD tqmaximumSize; TQCOORD tqmaximumSize;
TQCOORD tqminimumSize; TQCOORD tqminimumSize;
bool expansive; bool expansive;

4
tqtinterface/qt4/src/kernel/tqobject.cpp
Unescape View File

@ -817,7 +817,7 @@ void TQObject::timerEvent( TQTimerEvent * )
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
\endcode \endcode
in functions that depend on the state. One notable example is in functions that depend on the state. One notable example is
TQWidget::sizeHint(). TQWidget::tqsizeHint().
\sa event(), TQChildEvent \sa event(), TQChildEvent
*/ */
@ -1774,7 +1774,7 @@ void TQObject::timerEvent( TQTimerEvent * )
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
\endcode \endcode
in functions that depend on the state. One notable example is in functions that depend on the state. One notable example is
TQWidget::sizeHint(). TQWidget::tqsizeHint().
\sa event(), TQChildEvent \sa event(), TQChildEvent
*/ */

6
tqtinterface/qt4/src/kernel/tqrichtext.cpp
Unescape View File

@ -8232,7 +8232,7 @@ TQTextTableCell::~TQTextTableCell()
richtext = 0; richtext = 0;
} }
TQSize TQTextTableCell::sizeHint() const TQSize TQTextTableCell::tqsizeHint() const
{ {
int extra = 2 * (parent->innerborder + parent->cellpadding + border_tolerance); int extra = 2 * (parent->innerborder + parent->cellpadding + border_tolerance);
int used = richtext->widthUsed() + extra; int used = richtext->widthUsed() + extra;
@ -16164,7 +16164,7 @@ void TQTextTable::resize( int nwidth )
width = nwidth; width = nwidth;
tqlayout->tqinvalidate(); tqlayout->tqinvalidate();
int shw = tqlayout->sizeHint().width() + 2*outerborder; int shw = tqlayout->tqsizeHint().width() + 2*outerborder;
int mw = tqlayout->tqminimumSize().width() + 2*outerborder; int mw = tqlayout->tqminimumSize().width() + 2*outerborder;
if ( stretch ) if ( stretch )
width = TQMAX( mw, nwidth ); width = TQMAX( mw, nwidth );
@ -16488,7 +16488,7 @@ TQTextTableCell::~TQTextTableCell()
richtext = 0; richtext = 0;
} }
TQSize TQTextTableCell::sizeHint() const TQSize TQTextTableCell::tqsizeHint() const
{ {
int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance); int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance);
int used = richtext->widthUsed() + extra; int used = richtext->widthUsed() + extra;

4
tqtinterface/qt4/src/kernel/tqrichtext_p.h
Unescape View File

@ -615,7 +615,7 @@ public:
TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc); TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc);
virtual ~TQTextTableCell(); virtual ~TQTextTableCell();
TQSize sizeHint() const ; TQSize tqsizeHint() const ;
TQSize tqminimumSize() const ; TQSize tqminimumSize() const ;
TQSize tqmaximumSize() const ; TQSize tqmaximumSize() const ;
Qt::Orientations expandingDirections() const; Qt::Orientations expandingDirections() const;
@ -2788,7 +2788,7 @@ public:
TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc ); TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc );
virtual ~TQTextTableCell(); virtual ~TQTextTableCell();
TQSize sizeHint() const ; TQSize tqsizeHint() const ;
TQSize tqminimumSize() const ; TQSize tqminimumSize() const ;
TQSize tqmaximumSize() const ; TQSize tqmaximumSize() const ;
TQ_SPExpandData expandingDirections() const; TQ_SPExpandData expandingDirections() const;

8
tqtinterface/qt4/src/kernel/tqsizegrip.cpp
Unescape View File

@ -38,7 +38,7 @@
** **
**********************************************************************/ **********************************************************************/
#include "sizegrip.h" #include "tqsizegrip.h"
#ifndef TQT_NO_SIZEGRIP #ifndef TQT_NO_SIZEGRIP
@ -79,7 +79,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
/*! /*!
\class TQSizeGrip sizegrip.h \class TQSizeGrip tqsizegrip.h
\brief The TQSizeGrip class provides a corner-grip for resizing a top-level window. \brief The TQSizeGrip class provides a corner-grip for resizing a top-level window.
@ -153,9 +153,9 @@ TQSizeGrip::~TQSizeGrip()
/*! /*!
Returns the size grip's size hint; this is a small size. Returns the size grip's size hint; this is a small size.
*/ */
TQSize TQSizeGrip::sizeHint() const TQSize TQSizeGrip::tqsizeHint() const
{ {
return (tqstyle().sizeFromContents(TQStyle::CT_SizeGrip, this, TQSize(13, 13)). return (tqstyle().tqsizeFromContents(TQStyle::CT_SizeGrip, this, TQSize(13, 13)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }

2
tqtinterface/qt4/src/kernel/tqsizegrip.h
Unescape View File

@ -55,7 +55,7 @@ public:
TQSizeGrip( TQWidget* tqparent, const char* name=0 ); TQSizeGrip( TQWidget* tqparent, const char* name=0 );
~TQSizeGrip(); ~TQSizeGrip();
TQSize sizeHint() const; TQSize tqsizeHint() const;
protected: protected:
void paintEvent( TQPaintEvent * ); void paintEvent( TQPaintEvent * );

4
tqtinterface/qt4/src/kernel/tqstyle.h
Unescape View File

@ -256,7 +256,7 @@ inline TQStyleOption::TQStyleOption(const QStyleOption& qso) {
#define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_01 inline void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const { TQ_UNUSED(opt); TQ_UNUSED(w); static_cast<const TQStyle*>(this)->tqdrawPrimitive(pe, static_cast<TQPainter*>(p), TQRect(), TQColorGroup()); } #define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_01 inline void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const { TQ_UNUSED(opt); TQ_UNUSED(w); static_cast<const TQStyle*>(this)->tqdrawPrimitive(pe, static_cast<TQPainter*>(p), TQRect(), TQColorGroup()); }
#define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_02 inline QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const { return static_cast<const TQStyle*>(this)->sizeFromContents( ct, static_cast<const TQWidget*>(w), contentsSize, TQT_TQSTYLEOPTION_OBJECT(*opt) ); } #define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_02 inline QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const { return static_cast<const TQStyle*>(this)->tqsizeFromContents( ct, static_cast<const TQWidget*>(w), contentsSize, TQT_TQSTYLEOPTION_OBJECT(*opt) ); }
#define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_03 inline QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const { TQ_UNUSED(fm); return static_cast<const TQStyle*>(this)->tqitemRect(NULL, r, flags, enabled, NULL, text); } #define TQT_TQSTYLE_QT4_INTERFACE_VFUNC_03 inline QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const { TQ_UNUSED(fm); return static_cast<const TQStyle*>(this)->tqitemRect(NULL, r, flags, enabled, NULL, text); }
@ -487,7 +487,7 @@ public:
inline static TQRect tqvisualRect( const QRect &logical, const QRect &bounding ) { return visualRect(QApplication::layoutDirection(), bounding, logical); } inline static TQRect tqvisualRect( const QRect &logical, const QRect &bounding ) { return visualRect(QApplication::layoutDirection(), bounding, logical); }
// virtual void tqdrawPrimitiveBase( TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const = 0; // virtual void tqdrawPrimitiveBase( TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const = 0;
virtual TQSize sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const = 0; virtual TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const = 0;
virtual int tqstyleHint( TQ_StyleHint stylehint, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default, TQStyleHintReturn* returnData = 0) const = 0; virtual int tqstyleHint( TQ_StyleHint stylehint, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default, TQStyleHintReturn* returnData = 0) const = 0;
virtual TQRect subRect( SubRect r, const TQWidget *widget ) const = 0; // There doesn't seem to be a Qt4 equivalent for this virtual function; should it just be left as-is here? virtual TQRect subRect( SubRect r, const TQWidget *widget ) const = 0; // There doesn't seem to be a Qt4 equivalent for this virtual function; should it just be left as-is here?
virtual TQRect tqitemRect( QPainter *p, const QRect &r, int flags, bool enabled, const QPixmap *pixmap, const QString &text, int len = -1 ) const; virtual TQRect tqitemRect( QPainter *p, const QRect &r, int flags, bool enabled, const QPixmap *pixmap, const QString &text, int len = -1 ) const;

4
tqtinterface/qt4/src/kernel/tqt.h
Unescape View File

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include "tqtextstream.h" #include "tqtextstream.h"
#include "tqfontinfo.h" #include "tqfontinfo.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqtl.h" #include "tqtl.h"
#include "tqsize.h" #include "tqsize.h"
#include "tqrect.h" #include "tqrect.h"
@ -195,7 +195,7 @@
#include <tqsignalslotimp.h> #include <tqsignalslotimp.h>
#include <tqsimplerichtext.h> #include <tqsimplerichtext.h>
#include "tqwmatrix.h" #include "tqwmatrix.h"
#include <sizegrip.h> #include <tqsizegrip.h>
#include <tqabstractlayout.h> #include <tqabstractlayout.h>
#include <tqsjiscodec.h> #include <tqsjiscodec.h>
#include <tqslider.h> #include <tqslider.h>

20
tqtinterface/qt4/src/kernel/tqtglobaldefines.h
Unescape View File

@ -195,11 +195,11 @@
// #define tqcrossCursor Qt::CrossCursor // #define tqcrossCursor Qt::CrossCursor
// #define tqwaitCursor Qt::WaitCursor // #define tqwaitCursor Qt::WaitCursor
// #define tqibeamCursor Qt::IBeamCursor // #define tqibeamCursor Qt::IBeamCursor
// #define sizeVerCursor Qt::SizeVerCursor // #define tqsizeVerCursor Qt::SizeVerCursor
// #define sizeHorCursor Qt::SizeHorCursor // #define tqsizeHorCursor Qt::SizeHorCursor
// #define sizeBDiagCursor Qt::SizeBDiagCursor // #define tqsizeBDiagCursor Qt::SizeBDiagCursor
// #define sizeFDiagCursor Qt::SizeFDiagCursor // #define tqsizeFDiagCursor Qt::SizeFDiagCursor
// #define sizeAllCursor Qt::SizeAllCursor // #define tqsizeAllCursor Qt::SizeAllCursor
// #define tqblankCursor Qt::BlankCursor // #define tqblankCursor Qt::BlankCursor
// #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitVCursor Qt::SplitVCursor
// #define tqsplitHCursor Qt::SplitHCursor // #define tqsplitHCursor Qt::SplitHCursor
@ -213,11 +213,11 @@
#define tqcrossCursor TQt::crossCursor #define tqcrossCursor TQt::crossCursor
#define tqwaitCursor TQt::waitCursor #define tqwaitCursor TQt::waitCursor
#define tqibeamCursor TQt::ibeamCursor #define tqibeamCursor TQt::ibeamCursor
#define sizeVerCursor TQt::sizeVerCursor #define tqsizeVerCursor TQt::sizeVerCursor
#define sizeHorCursor TQt::sizeHorCursor #define tqsizeHorCursor TQt::sizeHorCursor
#define sizeBDiagCursor TQt::sizeBDiagCursor #define tqsizeBDiagCursor TQt::sizeBDiagCursor
#define sizeFDiagCursor TQt::sizeFDiagCursor #define tqsizeFDiagCursor TQt::sizeFDiagCursor
#define sizeAllCursor TQt::sizeAllCursor #define tqsizeAllCursor TQt::sizeAllCursor
#define tqblankCursor TQt::blankCursor #define tqblankCursor TQt::blankCursor
#define tqsplitVCursor TQt::splitVCursor #define tqsplitVCursor TQt::splitVCursor
#define tqsplitHCursor TQt::splitHCursor #define tqsplitHCursor TQt::splitHCursor

2
tqtinterface/qt4/src/kernel/tqvariant.cpp
Unescape View File

@ -60,7 +60,7 @@
#include "tqbitmap.h" #include "tqbitmap.h"
#include "tqcursor.h" #include "tqcursor.h"
#include "tqdatetime.h" #include "tqdatetime.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqshared.h" #include "tqshared.h"
#include "tqbitarray.h" #include "tqbitarray.h"
#include "tqkeysequence.h" #include "tqkeysequence.h"

2
tqtinterface/qt4/src/kernel/tqvariant.cpp.new
Unescape View File

@ -60,7 +60,7 @@
#include "tqbitmap.h" #include "tqbitmap.h"
#include "tqcursor.h" #include "tqcursor.h"
#include "tqdatetime.h" #include "tqdatetime.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqshared.h" #include "tqshared.h"
#include "tqbitarray.h" #include "tqbitarray.h"
#include "tqkeysequence.h" #include "tqkeysequence.h"

50
tqtinterface/qt4/src/kernel/tqwidget.cpp
Unescape View File

@ -302,7 +302,7 @@ const TQRect TQWidget::tqgeometry() const {
} }
QSize TQWidget::sizeHint() const { QSize TQWidget::sizeHint() const {
return sizeHint(); return tqsizeHint();
} }
QSize TQWidget::minimumSizeHint() const { QSize TQWidget::minimumSizeHint() const {
@ -436,7 +436,7 @@ void TQWidget::tqrepaint(const QRegion &rgn, bool) {
repaint(rgn); repaint(rgn);
} }
TQSizePolicy TQWidget::sizePolicy() const { TQSizePolicy TQWidget::tqsizePolicy() const {
return TQT_TQSIZEPOLICY_OBJECT(sizePolicy()); 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 \brief the recommended size for the widget
If the value of this property is an invalid size, no size is If the value of this property is an invalid size, no size is
recommended. 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 if there is no tqlayout for this widget, and returns the tqlayout's
preferred size otherwise. preferred size otherwise.
@ -1461,7 +1461,7 @@ TQStyle* TQWidget::setStyle( const TQString &style )
setMinimumSize(), updateGeometry() setMinimumSize(), updateGeometry()
*/ */
TQSize TQWidget::sizeHint() const TQSize TQWidget::tqsizeHint() const
{ {
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
if ( tqlayout() ) if ( tqlayout() )
@ -2624,11 +2624,11 @@ int TQWidget::x11Depth() const {
/*! /*!
Adjusts the size of the widget to fit the contents. 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 are \>= 0), otherwise sets the size to the tqchildren rectangle (the
union of all child widget geometries). union of all child widget geometries).
\sa sizeHint(), tqchildrenRect() \sa tqsizeHint(), tqchildrenRect()
*/ */
void TQWidget::adjustSize() void TQWidget::adjustSize()
@ -2637,7 +2637,7 @@ void TQWidget::adjustSize()
TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
if ( !testWState(WState_Polished) ) if ( !testWState(WState_Polished) )
polish(); polish();
TQSize s = sizeHint(); TQSize s = tqsizeHint();
if ( isTopLevel() ) { if ( isTopLevel() ) {
@ -2819,7 +2819,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
height(), height(),
sizePolicy(), sizePolicy(),
tqsetSizePolicy(), tqsetSizePolicy(),
sizeHint(), tqsizeHint(),
updateGeometry(), updateGeometry(),
tqlayout(), tqlayout(),
move(), move(),
@ -3091,11 +3091,11 @@ WState TQWidget::testWState( TQt::WidgetState s ) const {
\i In the constructor, be sure to set up your member variables \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. 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 the correct size policy with tqsetSizePolicy(), so users of your class
can set up tqlayout management more easily. A size policy lets you can set up tqlayout management more easily. A size policy lets you
supply good defaults for the tqlayout management handling, so that 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. indicates a "good" size for the widget.
\i If your widget is a top-level window, setCaption() and setIcon() set \i If your widget is a top-level window, setCaption() and setIcon() set
@ -3205,7 +3205,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) {
#endif #endif
TQSize qt_naturalWidgetSize( TQWidget *w ) { TQSize qt_naturalWidgetSize( TQWidget *w ) {
TQSize s = w->sizeHint(); TQSize s = w->tqsizeHint();
TQ_SPExpandData exp; TQ_SPExpandData exp;
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
if ( w->tqlayout() ) { 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 Sets both the minimum and maximum width of the widget to \a w
without changing the heights. Provided for convenience. without changing the heights. Provided for convenience.
\sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize()
*/ */
void TQWidget::setFixedWidth( int w ) 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 Sets both the minimum and maximum heights of the widget to \a h
without changing the widths. Provided for convenience. without changing the widths. Provided for convenience.
\sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize()
*/ */
void TQWidget::setFixedHeight( int h ) void TQWidget::setFixedHeight( int h )
@ -6895,7 +6895,7 @@ void TQWidget::polish()
Ensures that the widget is properly initialized by calling Ensures that the widget is properly initialized by calling
polish(). 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 the widget being initialized, and that may be called before
show(). show().
@ -7134,11 +7134,11 @@ TQRegion TQWidget::clipRegion() const
/*! /*!
Adjusts the size of the widget to fit the contents. 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 are \>= 0), otherwise sets the size to the tqchildren rectangle (the
union of all child widget geometries). union of all child widget geometries).
\sa sizeHint(), tqchildrenRect() \sa tqsizeHint(), tqchildrenRect()
*/ */
void TQWidget::adjustSize() void TQWidget::adjustSize()
@ -7147,7 +7147,7 @@ void TQWidget::adjustSize()
TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
if ( !testWState(WState_Polished) ) if ( !testWState(WState_Polished) )
polish(); polish();
TQSize s = sizeHint(); TQSize s = tqsizeHint();
if ( isTopLevel() ) { if ( isTopLevel() ) {
@ -7184,13 +7184,13 @@ void TQWidget::adjustSize()
/*! /*!
\property TQWidget::sizeHint \property TQWidget::tqsizeHint
\brief the recommended size for the widget \brief the recommended size for the widget
If the value of this property is an invalid size, no size is If the value of this property is an invalid size, no size is
recommended. 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 if there is no tqlayout for this widget, and returns the tqlayout's
preferred size otherwise. preferred size otherwise.
@ -7198,7 +7198,7 @@ void TQWidget::adjustSize()
setMinimumSize(), updateGeometry() setMinimumSize(), updateGeometry()
*/ */
TQSize TQWidget::sizeHint() const TQSize TQWidget::tqsizeHint() const
{ {
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
if ( tqlayout() ) if ( tqlayout() )
@ -8455,7 +8455,7 @@ void TQWidget::setLayout( TQLayout *l )
The default policy is Preferred/Preferred, which means that the The default policy is Preferred/Preferred, which means that the
widget can be freely resized, but prefers to be the size 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 specify that they may stretch horizontally, but are fixed
vertically. The same applies to lineedit controls (such as vertically. The same applies to lineedit controls (such as
TQLineEdit, TQSpinBox or an editable TQComboBox) and other 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 respective direction only. Widgets that can provide scrollbars
(usually subclasses of TQScrollView) tend to specify that they can (usually subclasses of TQScrollView) tend to specify that they can
use additional space, and that they can make do with less than 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 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 Notifies the tqlayout system that this widget has changed and may
need to change tqgeometry. 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 For explicitly hidden widgets, updateGeometry() is a no-op. The
tqlayout system will be notified as soon as the widget is shown. tqlayout system will be notified as soon as the widget is shown.

10
tqtinterface/qt4/src/kernel/tqwidget.h
Unescape View File

@ -51,7 +51,7 @@
#include "tqfont.h" #include "tqfont.h"
#include "tqfontmetrics.h" #include "tqfontmetrics.h"
#include "tqfontinfo.h" #include "tqfontinfo.h"
#include "sizepolicy.h" #include "tqsizepolicy.h"
#include "tqbitmap.h" #include "tqbitmap.h"
#endif // TQT_H #endif // TQT_H
@ -244,7 +244,7 @@ public:
TQObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); TQObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE );
const TQRect tqgeometry() const; const TQRect tqgeometry() const;
TQLayout *tqlayout() const; TQLayout *tqlayout() const;
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSizeHint() const; virtual TQSize tqminimumSizeHint() const;
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const; virtual QSize minimumSizeHint() const;
@ -286,7 +286,7 @@ public:
void tqrepaint(int x, int y, int w, int h, bool); void tqrepaint(int x, int y, int w, int h, bool);
void tqrepaint(const QRect &r, bool); void tqrepaint(const QRect &r, bool);
void tqrepaint(const QRegion &rgn, bool); void tqrepaint(const QRegion &rgn, bool);
TQSizePolicy sizePolicy() const; TQSizePolicy tqsizePolicy() const;
TQPoint backgroundOffset() const; TQPoint backgroundOffset() const;
bool tqsignalsBlocked() const; bool tqsignalsBlocked() const;
TQObjectList *queryList( const char *inheritsClass = 0, const char *objName = 0, bool regexpMatch = TRUE, bool recursiveSearch = TRUE ) const; TQObjectList *queryList( const char *inheritsClass = 0, const char *objName = 0, bool regexpMatch = TRUE, bool recursiveSearch = TRUE ) const;
@ -638,7 +638,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice
Q_PROPERTY( bool minimized READ isMinimized ) Q_PROPERTY( bool minimized READ isMinimized )
Q_PROPERTY( bool maximized READ isMaximized ) Q_PROPERTY( bool maximized READ isMaximized )
Q_PROPERTY( bool fullScreen READ isFullScreen ) Q_PROPERTY( bool fullScreen READ isFullScreen )
Q_PROPERTY( TQSize sizeHint READ sizeHint ) Q_PROPERTY( TQSize tqsizeHint READ tqsizeHint )
Q_PROPERTY( TQSize tqminimumSizeHint READ tqminimumSizeHint ) Q_PROPERTY( TQSize tqminimumSizeHint READ tqminimumSizeHint )
Q_PROPERTY( TQRect microFocusHint READ microFocusHint ) Q_PROPERTY( TQRect microFocusHint READ microFocusHint )
Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops ) Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
@ -900,7 +900,7 @@ public:
uint windowState() const; uint windowState() const;
void setWindowState(uint windowState); void setWindowState(uint windowState);
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
virtual TQSize tqminimumSizeHint() const; virtual TQSize tqminimumSizeHint() const;
virtual TQSizePolicy sizePolicy() const; virtual TQSizePolicy sizePolicy() const;
virtual void tqsetSizePolicy( TQSizePolicy ); virtual void tqsetSizePolicy( TQSizePolicy );

2
tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp
Unescape View File

@ -344,7 +344,7 @@ update. For example:
*/ */
//## possibly add sizeHint parameter //## possibly add tqsizeHint parameter
bool TQSqlCursorManager::tqfindBuffer( const TQSqlIndex& idx, int atHint ) bool TQSqlCursorManager::tqfindBuffer( const TQSqlIndex& idx, int atHint )
{ {
#ifdef TQT_DEBUG_DATAMANAGER #ifdef TQT_DEBUG_DATAMANAGER

12
tqtinterface/qt4/src/styles/tqcommonstyle.cpp
Unescape View File

@ -1187,7 +1187,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQWidget *widget) const
TQDialogButtons::Help }; TQDialogButtons::Help };
for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) { for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) {
if(dbtns->isButtonVisible(btns[i])) { if(dbtns->isButtonVisible(btns[i])) {
TQSize szH = dbtns->sizeHint(btns[i]); TQSize szH = dbtns->tqsizeHint(btns[i]);
int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height()); int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height());
if(dbtns->orientation() == Qt::Horizontal) { if(dbtns->orientation() == Qt::Horizontal) {
start -= mwidth; start -= mwidth;
@ -2458,7 +2458,7 @@ int TQCommonStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
/*! \reimp */ /*! \reimp */
TQSize TQCommonStyle::sizeFromContents(ContentsType contents, TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& opt ) const const TQStyleOption& opt ) const
@ -2467,7 +2467,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
#if defined(TQT_CHECK_STATE) #if defined(TQT_CHECK_STATE)
if (! widget) { if (! widget) {
qWarning("TQCommonStyle::sizeFromContents: widget parameter cannot be zero!"); qWarning("TQCommonStyle::tqsizeFromContents: widget parameter cannot be zero!");
return sz; return sz;
} }
#endif #endif
@ -2492,7 +2492,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
TQDialogButtons::Help }; TQDialogButtons::Help };
for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) { for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) {
if(dbtns->isButtonVisible(btns[i])) { if(dbtns->isButtonVisible(btns[i])) {
TQSize szH = dbtns->sizeHint(btns[i]); TQSize szH = dbtns->tqsizeHint(btns[i]);
int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height()); int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height());
if(dbtns->orientation() == Qt::Horizontal) if(dbtns->orientation() == Qt::Horizontal)
h = TQMAX(h, mheight); h = TQMAX(h, mheight);
@ -2587,8 +2587,8 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
int w = sz.width(), h = sz.height(); int w = sz.width(), h = sz.height();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->sizeHint().width(); w = mi->custom()->tqsizeHint().width();
h = mi->custom()->sizeHint().height(); h = mi->custom()->tqsizeHint().height();
if (! mi->custom()->fullSpan()) if (! mi->custom()->fullSpan())
h += 8; h += 8;
} else if ( mi->widget() ) { } else if ( mi->widget() ) {

2
tqtinterface/qt4/src/styles/tqcommonstyle.h
Unescape View File

@ -127,7 +127,7 @@ public:
int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType s, TQSize tqsizeFromContents( ContentsType s,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;

2
tqtinterface/qt4/src/styles/tqcompactstyle.cpp
Unescape View File

@ -129,7 +129,7 @@ static int popupMenuItemHeight( bool /*checkable*/, TQMenuItem* mi, const TQFont
h = TQMAX( h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height() + 2*motifItemFrame ); h = TQMAX( h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height() + 2*motifItemFrame );
} }
if ( mi->custom() ) if ( mi->custom() )
h = TQMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1; h = TQMAX( h, mi->custom()->tqsizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
return h; return h;
} }

10
tqtinterface/qt4/src/styles/tqmotifstyle.cpp
Unescape View File

@ -1730,7 +1730,7 @@ TQRect TQMotifStyle::querySubControlMetrics( TQ_ComplexControl control,
/*!\reimp /*!\reimp
*/ */
TQSize TQMotifStyle::sizeFromContents( ContentsType contents, TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& opt ) const const TQStyleOption& opt ) const
@ -1742,7 +1742,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
{ {
#ifndef TQT_NO_PUSHBUTTON #ifndef TQT_NO_PUSHBUTTON
const TQPushButton *button = (const TQPushButton *) widget; const TQPushButton *button = (const TQPushButton *) widget;
sz = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, opt); sz = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, opt);
if ((button->isDefault() || button->autoDefault()) && if ((button->isDefault() || button->autoDefault()) &&
sz.width() < 80 && ! button->pixmap()) sz.width() < 80 && ! button->pixmap())
sz.setWidth(80); sz.setWidth(80);
@ -1763,8 +1763,8 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
int w = sz.width(), h = sz.height(); int w = sz.width(), h = sz.height();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->sizeHint().width(); w = mi->custom()->tqsizeHint().width();
h = mi->custom()->sizeHint().height(); h = mi->custom()->tqsizeHint().height();
if (! mi->custom()->fullSpan()) if (! mi->custom()->fullSpan())
h += 2*motifItemVMargin + 2*motifItemFrame; h += 2*motifItemVMargin + 2*motifItemFrame;
} else if ( mi->widget() ) { } else if ( mi->widget() ) {
@ -1802,7 +1802,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
} }
default: default:
sz = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, opt ); sz = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, opt );
break; break;
} }

2
tqtinterface/qt4/src/styles/tqmotifstyle.h
Unescape View File

@ -109,7 +109,7 @@ public:
int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents, TQSize tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;

6
tqtinterface/qt4/src/styles/tqsgistyle.cpp
Unescape View File

@ -1365,7 +1365,7 @@ void TQSGIStyle::tqdrawComplexControl( TQ_ComplexControl control,
/*!\reimp /*!\reimp
*/ */
TQSize TQSGIStyle::sizeFromContents( ContentsType contents, TQSize TQSGIStyle::tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& opt ) const const TQStyleOption& opt ) const
@ -1380,7 +1380,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
break; break;
TQMenuItem *mi = opt.menuItem(); TQMenuItem *mi = opt.menuItem();
sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize,
opt ); opt );
// SGI checkmark items needs a bit more room // SGI checkmark items needs a bit more room
const TQPopupMenu *popup = (TQPopupMenu *) widget; const TQPopupMenu *popup = (TQPopupMenu *) widget;
@ -1397,7 +1397,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
break; break;
default: default:
sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, opt ); sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize, opt );
break; break;
} }

2
tqtinterface/qt4/src/styles/tqsgistyle.h
Unescape View File

@ -103,7 +103,7 @@ public:
int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents, TQSize tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;

10
tqtinterface/qt4/src/styles/tqwindowsstyle.cpp
Unescape View File

@ -1169,7 +1169,7 @@ int TQWindowsStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) co
/*! /*!
\reimp \reimp
*/ */
TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& opt ) const const TQStyleOption& opt ) const
@ -1181,7 +1181,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
{ {
#ifndef TQT_NO_PUSHBUTTON #ifndef TQT_NO_PUSHBUTTON
const TQPushButton *button = (const TQPushButton *) widget; const TQPushButton *button = (const TQPushButton *) widget;
sz = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, opt); sz = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, opt);
int w = sz.width(), h = sz.height(); int w = sz.width(), h = sz.height();
int defwidth = 0; int defwidth = 0;
@ -1211,8 +1211,8 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
int w = sz.width(), h = sz.height(); int w = sz.width(), h = sz.height();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->sizeHint().width(); w = mi->custom()->tqsizeHint().width();
h = mi->custom()->sizeHint().height(); h = mi->custom()->tqsizeHint().height();
if (! mi->custom()->fullSpan()) if (! mi->custom()->fullSpan())
h += 2*windowsItemVMargin + 2*windowsItemFrame; h += 2*windowsItemVMargin + 2*windowsItemFrame;
} else if ( mi->widget() ) { } else if ( mi->widget() ) {
@ -1261,7 +1261,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
} }
default: default:
sz = TQCommonStyle::sizeFromContents(contents, widget, sz, opt); sz = TQCommonStyle::tqsizeFromContents(contents, widget, sz, opt);
break; break;
} }

2
tqtinterface/qt4/src/styles/tqwindowsstyle.h
Unescape View File

@ -104,7 +104,7 @@ public:
int tqpixelMetric( PixelMetric metric, int tqpixelMetric( PixelMetric metric,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents, TQSize tqsizeFromContents( ContentsType contents,
const TQWidget *widget, const TQWidget *widget,
const TQSize &contentsSize, const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) const; const TQStyleOption& = TQStyleOption::Default ) const;

38
tqtinterface/qt4/src/table/tqtable.cpp
Unescape View File

@ -786,7 +786,7 @@ TQTable::viewport() as tqparent.
If you reimplement this function you'll almost certainly need to If you reimplement this function you'll almost certainly need to
reimplement setContentFromEditor(), and may need to reimplement reimplement setContentFromEditor(), and may need to reimplement
sizeHint(). tqsizeHint().
\quotefile table/statistics/statistics.cpp \quotefile table/statistics/statistics.cpp
\skipto createEditor \skipto createEditor
@ -960,11 +960,11 @@ TQString TQTableItem::key() const
function. function.
*/ */
TQSize TQTableItem::sizeHint() const TQSize TQTableItem::tqsizeHint() const
{ {
TQSize strutSize = TQApplication::globalStrut(); TQSize strutSize = TQApplication::globalStrut();
if ( edType == Always && table()->cellWidget( rw, cl ) ) if ( edType == Always && table()->cellWidget( rw, cl ) )
return table()->cellWidget( rw, cl )->sizeHint().expandedTo( strutSize ); return table()->cellWidget( rw, cl )->tqsizeHint().expandedTo( strutSize );
TQSize s; TQSize s;
int x = 0; int x = 0;
@ -1461,11 +1461,11 @@ int TQComboTableItem::rtti() const
/*! \reimp */ /*! \reimp */
TQSize TQComboTableItem::sizeHint() const TQSize TQComboTableItem::tqsizeHint() const
{ {
fakeCombo->insertItem( currentText() ); fakeCombo->insertItem( currentText() );
fakeCombo->setCurrentItem( fakeCombo->count() - 1 ); fakeCombo->setCurrentItem( fakeCombo->count() - 1 );
TQSize sh = fakeCombo->sizeHint(); TQSize sh = fakeCombo->tqsizeHint();
fakeCombo->removeItem( fakeCombo->count() - 1 ); fakeCombo->removeItem( fakeCombo->count() - 1 );
return sh.expandedTo( TQApplication::globalStrut() ); return sh.expandedTo( TQApplication::globalStrut() );
} }
@ -1647,12 +1647,12 @@ int TQCheckTableItem::rtti() const
/*! \reimp */ /*! \reimp */
TQSize TQCheckTableItem::sizeHint() const TQSize TQCheckTableItem::tqsizeHint() const
{ {
TQSize sz = TQSize( table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ), TQSize sz = TQSize( table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
sz.setWidth( sz.width() + 6 ); sz.setWidth( sz.width() + 6 );
TQSize sh( TQTableItem::sizeHint() ); TQSize sh( TQTableItem::tqsizeHint() );
return TQSize( sh.width() + sz.width(), TQMAX( sh.height(), sz.height() ) ). return TQSize( sh.width() + sz.width(), TQMAX( sh.height(), sz.height() ) ).
expandedTo( TQApplication::globalStrut() ); expandedTo( TQApplication::globalStrut() );
} }
@ -4329,7 +4329,7 @@ void TQTable::focusOutEvent( TQFocusEvent* tqfe )
/*! \reimp /*! \reimp
*/ */
TQSize TQTable::sizeHint() const TQSize TQTable::tqsizeHint() const
{ {
if ( cachedSizeHint().isValid() ) if ( cachedSizeHint().isValid() )
return cachedSizeHint(); return cachedSizeHint();
@ -4342,7 +4342,7 @@ TQSize TQTable::sizeHint() const
sh = TQSize( tableSize().width() + VERTICALMARGIN + 5, sh = TQSize( tableSize().width() + VERTICALMARGIN + 5,
tableSize().height() + topMargin() + 5 ); tableSize().height() + topMargin() + 5 );
} else { } else {
sh = TQScrollView::sizeHint(); sh = TQScrollView::tqsizeHint();
if ( !topHeader->isHidden() ) if ( !topHeader->isHidden() )
sh.setHeight( sh.height() + topHeader->height() ); sh.setHeight( sh.height() + topHeader->height() );
if ( !leftHeader->isHidden() ) if ( !leftHeader->isHidden() )
@ -4927,7 +4927,7 @@ void TQTable::setNumRows( int r )
} }
} }
fontChange(font()); // tqinvalidate the sizeHintCache fontChange(font()); // tqinvalidate the tqsizeHintCache
TQPtrVector<TQTableItem> tmp; TQPtrVector<TQTableItem> tmp;
TQPtrVector<TableWidget> tmp2; TQPtrVector<TableWidget> tmp2;
@ -4976,7 +4976,7 @@ void TQTable::setNumCols( int c )
} }
} }
fontChange(font()); // tqinvalidate the sizeHintCache fontChange(font()); // tqinvalidate the tqsizeHintCache
TQPtrVector<TQTableItem> tmp; TQPtrVector<TQTableItem> tmp;
TQPtrVector<TableWidget> tmp2; TQPtrVector<TableWidget> tmp2;
@ -5824,12 +5824,12 @@ void TQTable::adjustColumn( int col )
if ( !itm ) { if ( !itm ) {
TQWidget *widget = cellWidget( i, col ); TQWidget *widget = cellWidget( i, col );
if ( widget ) if ( widget )
w = TQMAX( w, widget->sizeHint().width() ); w = TQMAX( w, widget->tqsizeHint().width() );
} else { } else {
if ( itm->colSpan() > 1 ) if ( itm->colSpan() > 1 )
w = TQMAX( w, itm->sizeHint().width() / itm->colSpan() ); w = TQMAX( w, itm->tqsizeHint().width() / itm->colSpan() );
else else
w = TQMAX( w, itm->sizeHint().width() ); w = TQMAX( w, itm->tqsizeHint().width() );
} }
} }
w = TQMAX( w, TQApplication::globalStrut().width() ); w = TQMAX( w, TQApplication::globalStrut().width() );
@ -5854,12 +5854,12 @@ void TQTable::adjustRow( int row )
if ( !itm ) { if ( !itm ) {
TQWidget *widget = cellWidget( row, i ); TQWidget *widget = cellWidget( row, i );
if ( widget ) if ( widget )
h = TQMAX( h, widget->sizeHint().height() ); h = TQMAX( h, widget->tqsizeHint().height() );
} else { } else {
if ( itm->rowSpan() > 1 ) if ( itm->rowSpan() > 1 )
h = TQMAX( h, itm->sizeHint().height() / itm->rowSpan() ); h = TQMAX( h, itm->tqsizeHint().height() / itm->rowSpan() );
else else
h = TQMAX( h, itm->sizeHint().height() ); h = TQMAX( h, itm->tqsizeHint().height() );
} }
} }
h = TQMAX( h, TQApplication::globalStrut().height() ); h = TQMAX( h, TQApplication::globalStrut().height() );
@ -6905,11 +6905,11 @@ void TQTableHeader::sectionLabelChanged( int section )
// this does not really belong here // this does not really belong here
if ( orientation() == Qt::Horizontal ) { if ( orientation() == Qt::Horizontal ) {
int h = sizeHint().height(); int h = tqsizeHint().height();
if ( h != height() && mayOverwriteMargin(table->topMargin(), h) ) if ( h != height() && mayOverwriteMargin(table->topMargin(), h) )
table->setTopMargin( h ); table->setTopMargin( h );
} else { } else {
int w = sizeHint().width(); int w = tqsizeHint().width();
if ( w != width() && mayOverwriteMargin( ( TQApplication::reverseLayout() ? table->rightMargin() : table->leftMargin() ), w) ) if ( w != width() && mayOverwriteMargin( ( TQApplication::reverseLayout() ? table->rightMargin() : table->leftMargin() ), w) )
table->setLeftMargin( w ); table->setLeftMargin( w );
} }

8
tqtinterface/qt4/src/table/tqtable.h
Unescape View File

@ -143,7 +143,7 @@ public:
bool isReplaceable() const; bool isReplaceable() const;
virtual TQString key() const; virtual TQString key() const;
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
virtual void setSpan( int rs, int cs ); virtual void setSpan( int rs, int cs );
int rowSpan() const; int rowSpan() const;
@ -208,7 +208,7 @@ public:
int rtti() const; int rtti() const;
static int RTTI; static int RTTI;
TQSize sizeHint() const; TQSize tqsizeHint() const;
private: private:
TQComboBox *cb; TQComboBox *cb;
@ -236,7 +236,7 @@ public:
int rtti() const; int rtti() const;
static int RTTI; static int RTTI;
TQSize sizeHint() const; TQSize tqsizeHint() const;
private: private:
TQCheckBox *cb; TQCheckBox *cb;
@ -341,7 +341,7 @@ public:
virtual void paintCell( TQPainter *p, int row, int col, virtual void paintCell( TQPainter *p, int row, int col,
const TQRect &cr, bool selected, const TQColorGroup &cg ); const TQRect &cr, bool selected, const TQColorGroup &cg );
virtual void paintFocus( TQPainter *p, const TQRect &r ); virtual void paintFocus( TQPainter *p, const TQRect &r );
TQSize sizeHint() const; TQSize tqsizeHint() const;
bool isReadOnly() const; bool isReadOnly() const;
bool isRowReadOnly( int row ) const; bool isRowReadOnly( int row ) const;

2
tqtinterface/qt4/src/widgets/tqbutton.cpp
Unescape View File

@ -213,7 +213,7 @@ TQTimer *TQButton::timer()
To subclass TQButton, you must reimplement at least drawButton() To subclass TQButton, you must reimplement at least drawButton()
(to draw the button's outline) and drawButtonLabel() (to draw its (to draw the button's outline) and drawButtonLabel() (to draw its
text or pixmap). It is generally advisable to reimplement text or pixmap). It is generally advisable to reimplement
sizeHint() as well, and sometimes hitButton() (to determine tqsizeHint() as well, and sometimes hitButton() (to determine
whether a button press is within the button). whether a button press is within the button).
To reduce flickering, TQButton::paintEvent() sets up a pixmap that To reduce flickering, TQButton::paintEvent() sets up a pixmap that

8
tqtinterface/qt4/src/widgets/tqcheckbox.cpp
Unescape View File

@ -170,16 +170,16 @@ bool TQCheckBox::isTristate() const
/*!\reimp /*!\reimp
*/ */
TQSize TQCheckBox::sizeHint() const TQSize TQCheckBox::tqsizeHint() const
{ {
// NB: TQRadioButton::sizeHint() is similar // NB: TQRadioButton::tqsizeHint() is similar
constPolish(); constPolish();
TQPainter p(this); TQPainter p(this);
TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE,
pixmap(), text()).size(); pixmap(), text()).size();
return (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, sz). return (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, sz).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }
@ -316,7 +316,7 @@ void TQCheckBox::resizeEvent( TQResizeEvent *e )
TQPainter p(this); TQPainter p(this);
TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE,
pixmap(), text()).size(); pixmap(), text()).size();
TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, isz). TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, isz).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
update(wsz.width(), isz.width(), 0, wsz.height()); update(wsz.width(), isz.width(), 0, wsz.height());

2
tqtinterface/qt4/src/widgets/tqcheckbox.h
Unescape View File

@ -66,7 +66,7 @@ public:
void setTristate(bool y=TRUE); void setTristate(bool y=TRUE);
bool isTristate() const; bool isTristate() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
public Q_SLOTS: public Q_SLOTS:
void setChecked( bool check ); void setChecked( bool check );

26
tqtinterface/qt4/src/widgets/tqcombobox.cpp
Unescape View File

@ -367,13 +367,13 @@ public:
TQComboBoxPopupItem(TQListBoxItem *i) : TQCustomMenuItem(), li(i), sc(0, 0) { } TQComboBoxPopupItem(TQListBoxItem *i) : TQCustomMenuItem(), li(i), sc(0, 0) { }
virtual bool fullSpan() const { return TRUE; } virtual bool fullSpan() const { return TRUE; }
virtual void paint( TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); virtual void paint( TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
virtual TQSize sizeHint() { if (sc.isNull()) sc = TQSize(li->width(li->listBox()), TQMAX(25, li->height(li->listBox()))); return sc; } virtual TQSize tqsizeHint() { if (sc.isNull()) sc = TQSize(li->width(li->listBox()), TQMAX(25, li->height(li->listBox()))); return sc; }
}; };
void TQComboBoxPopupItem::paint( TQPainter* p, const TQColorGroup&, bool, void TQComboBoxPopupItem::paint( TQPainter* p, const TQColorGroup&, bool,
bool, int x, int y, int, int) bool, int x, int y, int, int)
{ {
p->save(); p->save();
p->translate(x, y + ((sizeHint().height() / 2) - (li->height(li->listBox()) / 2))); p->translate(x, y + ((tqsizeHint().height() / 2) - (li->height(li->listBox()) / 2)));
li->paint(p); li->paint(p);
p->restore(); p->restore();
} }
@ -419,7 +419,7 @@ public:
TQLineEdit * ed; // /bin/ed rules! TQLineEdit * ed; // /bin/ed rules!
TQTimer *completionTimer; TQTimer *completionTimer;
TQSize sizeHint; TQSize tqsizeHint;
private: private:
bool usingLBox; bool usingLBox;
@ -1077,10 +1077,10 @@ void TQComboBox::setAutoResize( bool enable )
the contents change dynamically. To tqinvalidate the cached value the contents change dynamically. To tqinvalidate the cached value
call setFont(). call setFont().
*/ */
TQSize TQComboBox::sizeHint() const TQSize TQComboBox::tqsizeHint() const
{ {
if ( isVisible() && d->sizeHint.isValid() ) if ( isVisible() && d->tqsizeHint.isValid() )
return d->sizeHint; return d->tqsizeHint;
constPolish(); constPolish();
int i, w; int i, w;
@ -1090,7 +1090,7 @@ TQSize TQComboBox::sizeHint() const
int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
if ( !d->usingListBox() ) { if ( !d->usingListBox() ) {
w = d->popup()->sizeHint().width() - 2* d->popup()->frameWidth(); w = d->popup()->tqsizeHint().width() - 2* d->popup()->frameWidth();
if ( w > maxW ) if ( w > maxW )
maxW = w; maxW = w;
} else { } else {
@ -1101,11 +1101,11 @@ TQSize TQComboBox::sizeHint() const
} }
} }
d->sizeHint = (tqstyle().sizeFromContents(TQStyle::CT_ComboBox, this, d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)). TQSize(maxW, maxH)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
return d->sizeHint; return d->tqsizeHint;
} }
@ -1185,7 +1185,7 @@ void TQComboBox::setPalette( const TQPalette &palette )
void TQComboBox::setFont( const TQFont &font ) void TQComboBox::setFont( const TQFont &font )
{ {
d->sizeHint = TQSize(); // tqinvalidate size hint d->tqsizeHint = TQSize(); // tqinvalidate size hint
TQWidget::setFont( font ); TQWidget::setFont( font );
if ( d->usingListBox() ) if ( d->usingListBox() )
d->listBox()->setFont( font ); d->listBox()->setFont( font );
@ -1519,7 +1519,7 @@ static int listHeight( TQListBox *l, int sl )
if ( l->count() > 0 ) if ( l->count() > 0 )
return TQMIN( l->count(), (uint)sl) * l->item( 0 )->height(l); return TQMIN( l->count(), (uint)sl) * l->item( 0 )->height(l);
else else
return l->sizeHint().height(); return l->tqsizeHint().height();
} }
@ -1569,7 +1569,7 @@ void TQComboBox::popup()
lb->triggerUpdate( TRUE ); lb->triggerUpdate( TRUE );
lb->installEventFilter( this ); lb->installEventFilter( this );
d->mouseWasInsidePopup = FALSE; d->mouseWasInsidePopup = FALSE;
int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = lb->variableWidth() ? lb->tqsizeHint().width() : width();
int h = listHeight( lb, d->sizeLimit ) + 2; int h = listHeight( lb, d->sizeLimit ) + 2;
TQRect screen = TQApplication::desktop()->availableGeometry( this ); TQRect screen = TQApplication::desktop()->availableGeometry( this );
@ -2204,7 +2204,7 @@ bool TQComboBox::autoCompletion() const
*/ */
void TQComboBox::styleChange( TQStyle& s ) void TQComboBox::styleChange( TQStyle& s )
{ {
d->sizeHint = TQSize(); // tqinvalidate size hint... d->tqsizeHint = TQSize(); // tqinvalidate size hint...
if ( d->ed ) if ( d->ed )
d->updateLinedGeometry(); d->updateLinedGeometry();
TQWidget::styleChange( s ); TQWidget::styleChange( s );

2
tqtinterface/qt4/src/widgets/tqcombobox.h
Unescape View File

@ -106,7 +106,7 @@ public:
bool autoResize() const; bool autoResize() const;
virtual void setAutoResize( bool ); virtual void setAutoResize( bool );
TQSize sizeHint() const; TQSize tqsizeHint() const;
void setPalette( const TQPalette & ); void setPalette( const TQPalette & );
void setFont( const TQFont & ); void setFont( const TQFont & );

18
tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp
Unescape View File

@ -1093,7 +1093,7 @@ void TQDateEdit::resizeEvent( TQResizeEvent * )
/*! \reimp /*! \reimp
*/ */
TQSize TQDateEdit::sizeHint() const TQSize TQDateEdit::tqsizeHint() const
{ {
constPolish(); constPolish();
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
@ -1109,7 +1109,7 @@ TQSize TQDateEdit::sizeHint() const
*/ */
TQSize TQDateEdit::tqminimumSizeHint() const TQSize TQDateEdit::tqminimumSizeHint() const
{ {
return sizeHint(); return tqsizeHint();
} }
@ -2550,7 +2550,7 @@ void TQTimeEdit::resizeEvent( TQResizeEvent * )
/*! \reimp /*! \reimp
*/ */
TQSize TQTimeEdit::sizeHint() const TQSize TQTimeEdit::tqsizeHint() const
{ {
constPolish(); constPolish();
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
@ -2572,7 +2572,7 @@ TQSize TQTimeEdit::sizeHint() const
*/ */
TQSize TQTimeEdit::tqminimumSizeHint() const TQSize TQTimeEdit::tqminimumSizeHint() const
{ {
return sizeHint(); return tqsizeHint();
} }
/*! /*!
@ -2694,8 +2694,8 @@ TQDateTimeEdit::~TQDateTimeEdit()
void TQDateTimeEdit::resizeEvent( TQResizeEvent * ) void TQDateTimeEdit::resizeEvent( TQResizeEvent * )
{ {
int dw = de->sizeHint().width(); int dw = de->tqsizeHint().width();
int tw = te->sizeHint().width(); int tw = te->tqsizeHint().width();
int w = width(); int w = width();
int h = height(); int h = height();
int extra = w - ( dw + tw ); int extra = w - ( dw + tw );
@ -2742,11 +2742,11 @@ void TQDateTimeEdit::init()
/*! \reimp /*! \reimp
*/ */
TQSize TQDateTimeEdit::sizeHint() const TQSize TQDateTimeEdit::tqsizeHint() const
{ {
constPolish(); constPolish();
TQSize dsh = de->sizeHint(); TQSize dsh = de->tqsizeHint();
TQSize tsh = te->sizeHint(); TQSize tsh = te->tqsizeHint();
return TQSize( dsh.width() + tsh.width(), return TQSize( dsh.width() + tsh.width(),
TQMAX( dsh.height(), tsh.height() ) ); TQMAX( dsh.height(), tsh.height() ) );
} }

6
tqtinterface/qt4/src/widgets/tqdatetimeedit.h
Unescape View File

@ -93,7 +93,7 @@ public:
enum Order { DMY, MDY, YMD, YDM }; enum Order { DMY, MDY, YMD, YDM };
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
public Q_SLOTS: public Q_SLOTS:
@ -180,7 +180,7 @@ public:
TQTimeEdit( const QTime& time, QWidget* tqparent=0, const char* name=0 ); TQTimeEdit( const QTime& time, QWidget* tqparent=0, const char* name=0 );
~TQTimeEdit(); ~TQTimeEdit();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
public Q_SLOTS: public Q_SLOTS:
@ -255,7 +255,7 @@ public:
const char* name=0 ); const char* name=0 );
~TQDateTimeEdit(); ~TQDateTimeEdit();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
public Q_SLOTS: public Q_SLOTS:

2
tqtinterface/qt4/src/widgets/tqdial.cpp
Unescape View File

@ -773,7 +773,7 @@ TQSize TQDial::tqminimumSizeHint() const
\reimp \reimp
*/ */
TQSize TQDial::sizeHint() const TQSize TQDial::tqsizeHint() const
{ {
return TQSize( 100, 100 ).expandedTo( TQApplication::globalStrut() ); return TQSize( 100, 100 ).expandedTo( TQApplication::globalStrut() );
} }

2
tqtinterface/qt4/src/widgets/tqdial.h
Unescape View File

@ -83,7 +83,7 @@ public:
bool notchesVisible() const; bool notchesVisible() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
int minValue() const; int minValue() const;

12
tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp
Unescape View File

@ -422,18 +422,18 @@ TQDialogButtons::layoutButtons()
} }
TQSize TQSize
TQDialogButtons::sizeHint() const TQDialogButtons::tqsizeHint() const
{ {
constPolish(); constPolish();
TQSize s; TQSize s;
if(d->custom) if(d->custom)
s = d->custom->sizeHint(); s = d->custom->tqsizeHint();
return (tqstyle().sizeFromContents(TQStyle::CT_DialogButtons, this, s. return (tqstyle().tqsizeFromContents(TQStyle::CT_DialogButtons, this, s.
expandedTo(TQApplication::globalStrut()))); expandedTo(TQApplication::globalStrut())));
} }
TQSize TQSize
TQDialogButtons::sizeHint(TQDialogButtons::Button button) const TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const
{ {
TQWidget *w = NULL; TQWidget *w = NULL;
if(d->visible & button) { if(d->visible & button) {
@ -445,12 +445,12 @@ TQDialogButtons::sizeHint(TQDialogButtons::Button button) const
w = d->buttons[button]; w = d->buttons[button];
} }
} }
return w->sizeHint(); return w->tqsizeHint();
} }
TQSize TQSize
TQDialogButtons::tqminimumSizeHint() const TQDialogButtons::tqminimumSizeHint() const
{ {
return sizeHint(); return tqsizeHint();
} }
#endif #endif

4
tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h
Unescape View File

@ -85,9 +85,9 @@ public:
void setOrientation(Qt::Orientation); void setOrientation(Qt::Orientation);
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
virtual TQSize sizeHint(Button) const; virtual TQSize tqsizeHint(Button) const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
protected: protected:
void layoutButtons(); void layoutButtons();

22
tqtinterface/qt4/src/widgets/tqdockarea.cpp
Unescape View File

@ -120,7 +120,7 @@ TQLayoutIterator TQDockAreaLayout::iterator()
return 0; return 0;
} }
TQSize TQDockAreaLayout::sizeHint() const TQSize TQDockAreaLayout::tqsizeHint() const
{ {
if ( !dockWindows || !dockWindows->first() ) if ( !dockWindows || !dockWindows->first() )
return TQSize( 0, 0 ); return TQSize( 0, 0 );
@ -215,9 +215,9 @@ static int space_left( const TQRect &r, int pos, Qt::Orientation o )
static int dock_extent( TQDockWindow *w, Qt::Orientation o, int maxsize ) static int dock_extent( TQDockWindow *w, Qt::Orientation o, int maxsize )
{ {
if ( o == Qt::Horizontal ) if ( o == Qt::Horizontal )
return TQMIN( maxsize, TQMAX( w->sizeHint().width(), w->fixedExtent().width() ) ); return TQMIN( maxsize, TQMAX( w->tqsizeHint().width(), w->fixedExtent().width() ) );
else else
return TQMIN( maxsize, TQMAX( w->sizeHint().height(), w->fixedExtent().height() ) ); return TQMIN( maxsize, TQMAX( w->tqsizeHint().height(), w->fixedExtent().height() ) );
} }
static int dock_strut( TQDockWindow *w, Qt::Orientation o ) static int dock_strut( TQDockWindow *w, Qt::Orientation o )
@ -226,12 +226,12 @@ static int dock_strut( TQDockWindow *w, Qt::Orientation o )
int wid; int wid;
if ( ( wid = w->fixedExtent().width() ) != -1 ) if ( ( wid = w->fixedExtent().width() ) != -1 )
return TQMAX( wid, TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) ); return TQMAX( wid, TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) );
return TQMAX( w->sizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) ); return TQMAX( w->tqsizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) );
} else { } else {
int hei; int hei;
if ( ( hei = w->fixedExtent().height() ) != -1 ) if ( ( hei = w->fixedExtent().height() ) != -1 )
return TQMAX( hei, TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) ); return TQMAX( hei, TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) );
return TQMAX( w->sizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) ); return TQMAX( w->tqsizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) );
} }
} }
@ -261,14 +261,14 @@ static void shrink_extend( TQDockWindow *dw, int &dockExtend, int /*spaceLeft*/,
if ( !tb ) if ( !tb )
mw = dw->minimumWidth(); mw = dw->minimumWidth();
else else
mw = dw->sizeHint().width(); mw = dw->tqsizeHint().width();
dockExtend = mw; dockExtend = mw;
} else { } else {
int mh = 0; int mh = 0;
if ( !tb ) if ( !tb )
mh = dw->minimumHeight(); mh = dw->minimumHeight();
else else
mh = dw->sizeHint().height(); mh = dw->tqsizeHint().height();
dockExtend = mh; dockExtend = mh;
} }
} }
@ -886,9 +886,9 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect
if ( mse != -10 && w->isResizeEnabled() ) { if ( mse != -10 && w->isResizeEnabled() ) {
if ( orientation() != Qt::Horizontal ) if ( orientation() != Qt::Horizontal )
w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->sizeHint().width() ) ); w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->tqsizeHint().width() ) );
else else
w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->sizeHint().height() ) ); w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->tqsizeHint().height() ) );
} }
updateLayout(); updateLayout();
@ -1171,13 +1171,13 @@ int TQDockArea::maxSpace( int hint, TQDockWindow *dw )
if ( !tb ) if ( !tb )
min = TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ); min = TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() );
else else
min = w->sizeHint().width(); min = w->tqsizeHint().width();
} else { } else {
w->setFixedExtentHeight( -1 ); w->setFixedExtentHeight( -1 );
if ( !tb ) if ( !tb )
min = TQMAX( w->tqminimumSize().height(), w->tqminimumSizeHint().height() ); min = TQMAX( w->tqminimumSize().height(), w->tqminimumSizeHint().height() );
else else
min = w->sizeHint().height(); min = w->tqsizeHint().height();
} }
int diff = hint - ( orientation() == Qt::Horizontal ? dw->width() : dw->height() ); int diff = hint - ( orientation() == Qt::Horizontal ? dw->width() : dw->height() );

2
tqtinterface/qt4/src/widgets/tqdockarea.h
Unescape View File

@ -75,7 +75,7 @@ public:
bool hasHeightForWidth() const; bool hasHeightForWidth() const;
int heightForWidth( int ) const; int heightForWidth( int ) const;
int widthForHeight( int ) const; int widthForHeight( int ) const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQLayoutIterator iterator(); TQLayoutIterator iterator();
TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::NoDirection; } // [FIXME] Is this redefinition cast to Qt::Orientations correct? TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::NoDirection; } // [FIXME] Is this redefinition cast to Qt::Orientations correct?

14
tqtinterface/qt4/src/widgets/tqdockwindow.cpp
Unescape View File

@ -80,7 +80,7 @@ public:
void setOrientation( Orientation o ); void setOrientation( Orientation o );
Orientation orientation() const { return orient; } Orientation orientation() const { return orient; }
TQSize sizeHint() const; TQSize tqsizeHint() const;
protected: protected:
void paintEvent( TQPaintEvent * ); void paintEvent( TQPaintEvent * );
@ -109,10 +109,10 @@ TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *tqp
setOrientation( o ); setOrientation( o );
} }
TQSize TQDockWindowResizeHandle::sizeHint() const TQSize TQDockWindowResizeHandle::tqsizeHint() const
{ {
int sw = 2 * tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this) / 3; int sw = 2 * tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this) / 3;
return (tqstyle().sizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)). return (tqstyle().tqsizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }
@ -320,7 +320,7 @@ public:
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQSize tqminimumSize() const { return tqminimumSizeHint(); } TQSize tqminimumSize() const { return tqminimumSizeHint(); }
TQSize sizeHint() const { return tqminimumSize(); } TQSize tqsizeHint() const { return tqminimumSize(); }
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
void setOpaqueMoving( bool b ) { opaque = b; } void setOpaqueMoving( bool b ) { opaque = b; }
@ -1148,7 +1148,7 @@ void TQDockWindow::swapRect( TQRect &r, Orientation o, const TQPoint &offset, TQ
TQBoxLayout *bl = boxLayout()->createTmpCopy(); TQBoxLayout *bl = boxLayout()->createTmpCopy();
bl->setDirection( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ); bl->setDirection( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom );
bl->activate(); bl->activate();
r.setSize( bl->sizeHint() ); r.setSize( bl->tqsizeHint() );
bl->data = 0; bl->data = 0;
delete bl; delete bl;
bool reverse = TQApplication::reverseLayout(); bool reverse = TQApplication::reverseLayout();
@ -1808,9 +1808,9 @@ TQBoxLayout *TQDockWindow::boxLayout()
/*! \reimp /*! \reimp
*/ */
TQSize TQDockWindow::sizeHint() const TQSize TQDockWindow::tqsizeHint() const
{ {
TQSize sh( TQFrame::sizeHint() ); TQSize sh( TQFrame::tqsizeHint() );
if ( place() == InDock ) if ( place() == InDock )
sh = sh.expandedTo( fixedExtent() ); sh = sh.expandedTo( fixedExtent() );
sh = sh.expandedTo( TQSize( 16, 16 ) ); sh = sh.expandedTo( TQSize( 16, 16 ) );

2
tqtinterface/qt4/src/widgets/tqdockwindow.h
Unescape View File

@ -133,7 +133,7 @@ public:
Orientation orientation() const; Orientation orientation() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;

4
tqtinterface/qt4/src/widgets/tqeffects.cpp
Unescape View File

@ -395,8 +395,8 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
totalWidth = widget->width(); totalWidth = widget->width();
totalHeight = widget->height(); totalHeight = widget->height();
} else { } else {
totalWidth = widget->sizeHint().width(); totalWidth = widget->tqsizeHint().width();
totalHeight = widget->sizeHint().height(); totalHeight = widget->tqsizeHint().height();
} }
currentHeight = totalHeight; currentHeight = totalHeight;

6
tqtinterface/qt4/src/widgets/tqframe.cpp
Unescape View File

@ -476,18 +476,18 @@ TQRect TQFrame::contentsRect() const
/*!\reimp /*!\reimp
*/ */
TQSize TQFrame::sizeHint() const TQSize TQFrame::tqsizeHint() const
{ {
// Returns a size hint for the frame - for HLine and VLine // Returns a size hint for the frame - for HLine and VLine
// tqshapes, this is stretchable one way and 3 pixels wide the // tqshapes, this is stretchable one way and 3 pixels wide the
// other. For other tqshapes, TQWidget::sizeHint() is used. // other. For other tqshapes, TQWidget::tqsizeHint() is used.
switch (fstyle & MShape) { switch (fstyle & MShape) {
case HLine: case HLine:
return TQSize(-1,3); return TQSize(-1,3);
case VLine: case VLine:
return TQSize(3,-1); return TQSize(3,-1);
default: default:
return TQWidget::sizeHint(); return TQWidget::tqsizeHint();
} }
} }

2
tqtinterface/qt4/src/widgets/tqframe.h
Unescape View File

@ -74,7 +74,7 @@ public:
bool lineShapesOk() const { return TRUE; } bool lineShapesOk() const { return TRUE; }
#endif #endif
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
enum Shape { NoFrame = 0, // no frame enum Shape { NoFrame = 0, // no frame
Box = 0x0001, // rectangular box Box = 0x0001, // rectangular box

6
tqtinterface/qt4/src/widgets/tqgrid.cpp
Unescape View File

@ -52,7 +52,7 @@
The number of rows \e or columns is defined in the constructor. The number of rows \e or columns is defined in the constructor.
All the grid's tqchildren will be placed and sized in accordance All the grid's tqchildren will be placed and sized in accordance
with their sizeHint() and sizePolicy(). with their tqsizeHint() and sizePolicy().
Use setMargin() to add space around the grid itself, and Use setMargin() to add space around the grid itself, and
setSpacing() to add space between the widgets. setSpacing() to add space between the widgets.
@ -128,10 +128,10 @@ void TQGrid::frameChanged()
\reimp \reimp
*/ */
TQSize TQGrid::sizeHint() const TQSize TQGrid::tqsizeHint() const
{ {
TQWidget *mThis = (TQWidget*)this; TQWidget *mThis = (TQWidget*)this;
TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted );
return TQFrame::sizeHint(); return TQFrame::tqsizeHint();
} }
#endif #endif

2
tqtinterface/qt4/src/widgets/tqgrid.h
Unescape View File

@ -55,7 +55,7 @@ public:
WFlags f = 0 ); WFlags f = 0 );
void setSpacing( int ); void setSpacing( int );
TQSize sizeHint() const; TQSize tqsizeHint() const;
#ifndef TQT_NO_COMPAT #ifndef TQT_NO_COMPAT
typedef Qt::Orientation Direction; typedef Qt::Orientation Direction;

14
tqtinterface/qt4/src/widgets/tqgroupbox.cpp
Unescape View File

@ -213,8 +213,8 @@ void TQGroupBox::setTextSpacer()
int fh = fm.height(); int fh = fm.height();
if ( isCheckable() ) { if ( isCheckable() ) {
#ifndef TQT_NO_CHECKBOX #ifndef TQT_NO_CHECKBOX
fh = d->checkbox->sizeHint().height() + 2; fh = d->checkbox->tqsizeHint().height() + 2;
w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); w = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" );
#endif #endif
} else { } else {
fh = fm.height(); fh = fm.height();
@ -766,14 +766,14 @@ void TQGroupBox::fontChange( const TQFont & oldFont )
\reimp \reimp
*/ */
TQSize TQGroupBox::sizeHint() const TQSize TQGroupBox::tqsizeHint() const
{ {
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
int tw, th; int tw, th;
if ( isCheckable() ) { if ( isCheckable() ) {
#ifndef TQT_NO_CHECKBOX #ifndef TQT_NO_CHECKBOX
tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); tw = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" );
th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') ); th = d->checkbox->tqsizeHint().height() + fm.width( TQChar(' ') );
#endif #endif
} else { } else {
tw = fm.width( title() ) + 2 * fm.width( "xx" ); tw = fm.width( title() ) + 2 * fm.width( "xx" );
@ -782,7 +782,7 @@ TQSize TQGroupBox::sizeHint() const
TQSize s; TQSize s;
if ( tqlayout() ) { if ( tqlayout() ) {
s = TQFrame::sizeHint(); s = TQFrame::tqsizeHint();
return s.expandedTo( TQSize( tw, 0 ) ); return s.expandedTo( TQSize( tw, 0 ) );
} else { } else {
TQRect r = tqchildrenRect(); TQRect r = tqchildrenRect();
@ -960,7 +960,7 @@ void TQGroupBox::setEnabled(bool on)
void TQGroupBox::updateCheckBoxGeometry() void TQGroupBox::updateCheckBoxGeometry()
{ {
if ( d->checkbox ) { if ( d->checkbox ) {
TQSize cbSize = d->checkbox->sizeHint(); TQSize cbSize = d->checkbox->tqsizeHint();
TQRect cbRect( 0, 0, cbSize.width(), cbSize.height() ); TQRect cbRect( 0, 0, cbSize.width(), cbSize.height() );
int marg = bFlat ? 2 : 8; int marg = bFlat ? 2 : 8;

2
tqtinterface/qt4/src/widgets/tqgroupbox.h
Unescape View File

@ -99,7 +99,7 @@ public:
void setInsideSpacing( int s ); void setInsideSpacing( int s );
void addSpace( int ); void addSpace( int );
TQSize sizeHint() const; TQSize tqsizeHint() const;
bool isFlat() const; bool isFlat() const;
void setFlat( bool b ); void setFlat( bool b );

6
tqtinterface/qt4/src/widgets/tqhbox.cpp
Unescape View File

@ -51,7 +51,7 @@
\ingroup appearance \ingroup appearance
All the horizontal box's child widgets will be placed alongside All the horizontal box's child widgets will be placed alongside
each other and sized according to their sizeHint()s. each other and sized according to their tqsizeHint()s.
Use setMargin() to add space around the edges, and use Use setMargin() to add space around the edges, and use
setSpacing() to add space between the widgets. Use setSpacing() to add space between the widgets. Use
@ -123,11 +123,11 @@ void TQHBox::setSpacing( int space )
\reimp \reimp
*/ */
TQSize TQHBox::sizeHint() const TQSize TQHBox::tqsizeHint() const
{ {
TQWidget *mThis = (TQWidget*)this; TQWidget *mThis = (TQWidget*)this;
TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted );
return TQFrame::sizeHint(); return TQFrame::tqsizeHint();
} }
/*! /*!

2
tqtinterface/qt4/src/widgets/tqhbox.h
Unescape View File

@ -57,7 +57,7 @@ public:
void setSpacing( int ); void setSpacing( int );
bool setStretchFactor( TQWidget*, int stretch ); bool setStretchFactor( TQWidget*, int stretch );
TQSize sizeHint() const; TQSize tqsizeHint() const;
protected: protected:
TQHBox( bool horizontal, TQWidget* tqparent, const char* name, WFlags f = 0 ); TQHBox( bool horizontal, TQWidget* tqparent, const char* name, WFlags f = 0 );

4
tqtinterface/qt4/src/widgets/tqheader.cpp
Unescape View File

@ -1224,7 +1224,7 @@ void TQHeader::setIsATableHeader( bool b )
} }
/*! \reimp */ /*! \reimp */
TQSize TQHeader::sizeHint() const TQSize TQHeader::tqsizeHint() const
{ {
int width; int width;
int height; int height;
@ -1255,7 +1255,7 @@ TQSize TQHeader::sizeHint() const
for ( int i = 0; i < count(); i++ ) for ( int i = 0; i < count(); i++ )
height += d->sizes[i]; height += d->sizes[i];
} }
return (tqstyle().sizeFromContents(TQStyle::CT_Header, this, return (tqstyle().tqsizeFromContents(TQStyle::CT_Header, this,
TQSize(width, height)).expandedTo(TQApplication::globalStrut())); TQSize(width, height)).expandedTo(TQApplication::globalStrut()));
} }

2
tqtinterface/qt4/src/widgets/tqheader.h
Unescape View File

@ -112,7 +112,7 @@ public:
int offset() const; int offset() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
int mapToSection( int index ) const; int mapToSection( int index ) const;
int mapToIndex( int section ) const; int mapToIndex( int section ) const;

26
tqtinterface/qt4/src/widgets/tqlabel.cpp
Unescape View File

@ -272,7 +272,7 @@ void TQLabel::setText( const TQString &text )
{ {
if ( ltext == text ) if ( ltext == text )
return; return;
TQSize osh = sizeHint(); TQSize osh = tqsizeHint();
#ifndef TQT_NO_RICHTEXT #ifndef TQT_NO_RICHTEXT
bool hadRichtext = doc != 0; bool hadRichtext = doc != 0;
#endif #endif
@ -338,7 +338,7 @@ void TQLabel::clear()
*/ */
void TQLabel::setPixmap( const TQPixmap &pixmap ) void TQLabel::setPixmap( const TQPixmap &pixmap )
{ {
TQSize osh = sizeHint(); TQSize osh = tqsizeHint();
if ( !lpixmap || lpixmap->serialNumber() != pixmap.serialNumber() ) { if ( !lpixmap || lpixmap->serialNumber() != pixmap.serialNumber() ) {
clearContents(); clearContents();
@ -363,7 +363,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap )
void TQLabel::setPicture( const TQPicture &picture ) void TQLabel::setPicture( const TQPicture &picture )
{ {
TQSize osh = sizeHint(); TQSize osh = tqsizeHint();
clearContents(); clearContents();
lpicture = new TQPicture( picture ); lpicture = new TQPicture( picture );
@ -439,7 +439,7 @@ void TQLabel::tqsetAlignment( int tqalignment )
{ {
if ( tqalignment == align ) if ( tqalignment == align )
return; return;
TQSize osh = sizeHint(); TQSize osh = tqsizeHint();
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
if ( lbuddy ) if ( lbuddy )
align = tqalignment | TQt::ShowPrefix; align = tqalignment | TQt::ShowPrefix;
@ -508,7 +508,7 @@ void TQLabel::setIndent( int indent )
Auto-resizing is disabled by default. Auto-resizing is disabled by default.
\sa autoResize(), adjustSize(), sizeHint() \sa autoResize(), adjustSize(), tqsizeHint()
*/ */
void TQLabel::setAutoResize( bool enable ) void TQLabel::setAutoResize( bool enable )
@ -524,7 +524,7 @@ void TQLabel::setAutoResize( bool enable )
/*! /*!
Returns the size that will be used if the width of the label is \a Returns the size that will be used if the width of the label is \a
w. If \a w is -1, the sizeHint() is returned. w. If \a w is -1, the tqsizeHint() is returned.
*/ */
TQSize TQLabel::sizeForWidth( int w ) const TQSize TQLabel::sizeForWidth( int w ) const
@ -620,7 +620,7 @@ int TQLabel::heightForWidth( int w ) const
/*!\reimp /*!\reimp
*/ */
TQSize TQLabel::sizeHint() const TQSize TQLabel::tqsizeHint() const
{ {
if ( d->valid_hints != frameWidth() ) if ( d->valid_hints != frameWidth() )
(void) TQLabel::tqminimumSizeHint(); (void) TQLabel::tqminimumSizeHint();
@ -654,9 +654,9 @@ TQSize TQLabel::tqminimumSizeHint() const
if ( d->sh.height() < sz.height() ) if ( d->sh.height() < sz.height() )
sz.rheight() = d->sh.height(); sz.rheight() = d->sh.height();
} }
if ( sizePolicy().horData() == TQSizePolicy::Ignored ) if ( tqsizePolicy().horData() == TQSizePolicy::Ignored )
sz.rwidth() = -1; sz.rwidth() = -1;
if ( sizePolicy().verData() == TQSizePolicy::Ignored ) if ( tqsizePolicy().verData() == TQSizePolicy::Ignored )
sz.rheight() = -1; sz.rheight() = -1;
d->msh = sz; d->msh = sz;
return sz; return sz;
@ -854,12 +854,12 @@ void TQLabel::drawContents( TQPainter *p )
void TQLabel::updateLabel( TQSize oldSizeHint ) void TQLabel::updateLabel( TQSize oldSizeHint )
{ {
d->valid_hints = -1; d->valid_hints = -1;
TQSizePolicy policy = sizePolicy(); TQSizePolicy policy = tqsizePolicy();
bool wordBreak = align & TQt::WordBreak; bool wordBreak = align & TQt::WordBreak;
policy.setHeightForWidth( wordBreak ); policy.setHeightForWidth( wordBreak );
if ( policy != sizePolicy() ) if ( policy != tqsizePolicy() )
tqsetSizePolicy( policy ); tqsetSizePolicy( policy );
if ( sizeHint() != oldSizeHint ) if ( tqsizeHint() != oldSizeHint )
updateGeometry(); updateGeometry();
if ( autoresize ) { if ( autoresize ) {
adjustSize(); adjustSize();
@ -1026,7 +1026,7 @@ void TQLabel::movieResized( const TQSize& size )
void TQLabel::setMovie( const TQMovie& movie ) void TQLabel::setMovie( const TQMovie& movie )
{ {
TQSize osh = sizeHint(); TQSize osh = tqsizeHint();
clearContents(); clearContents();
lmovie = new TQMovie( movie ); lmovie = new TQMovie( movie );

2
tqtinterface/qt4/src/widgets/tqlabel.h
Unescape View File

@ -95,7 +95,7 @@ public:
bool hasScaledContents() const; bool hasScaledContents() const;
void setScaledContents( bool ); void setScaledContents( bool );
#endif #endif
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
virtual void setBuddy( TQWidget * ); virtual void setBuddy( TQWidget * );

2
tqtinterface/qt4/src/widgets/tqlcdnumber.cpp
Unescape View File

@ -1162,7 +1162,7 @@ TQLCDNumber::SegmentStyle TQLCDNumber::segmentStyle() const
/*!\reimp /*!\reimp
*/ */
TQSize TQLCDNumber::sizeHint() const TQSize TQLCDNumber::tqsizeHint() const
{ {
return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 ); return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 );
} }

2
tqtinterface/qt4/src/widgets/tqlcdnumber.h
Unescape View File

@ -89,7 +89,7 @@ public:
double value() const; double value() const;
int intValue() const; int intValue() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
public Q_SLOTS: public Q_SLOTS:
void display( const TQString &str ); void display( const TQString &str );

4
tqtinterface/qt4/src/widgets/tqlineedit.cpp
Unescape View File

@ -640,14 +640,14 @@ void TQLineEdit::setValidator( const TQValidator *v )
20 characters. 20 characters.
*/ */
TQSize TQLineEdit::sizeHint() const TQSize TQLineEdit::tqsizeHint() const
{ {
constPolish(); constPolish();
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
int h = TQMAX(fm.lineSpacing(), 14) + 2*innerMargin; int h = TQMAX(fm.lineSpacing(), 14) + 2*innerMargin;
int w = fm.width( 'x' ) * 17; // "some" int w = fm.width( 'x' ) * 17; // "some"
int m = frameWidth() * 2; int m = frameWidth() * 2;
return (tqstyle().sizeFromContents(TQStyle::CT_LineEdit, this, return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this,
TQSize( w + m, h + m ). TQSize( w + m, h + m ).
expandedTo(TQApplication::globalStrut()))); expandedTo(TQApplication::globalStrut())));
} }

2
tqtinterface/qt4/src/widgets/tqlineedit.h
Unescape View File

@ -102,7 +102,7 @@ public:
const TQValidator * validator() const; const TQValidator * validator() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
int cursorPosition() const; int cursorPosition() const;

2
tqtinterface/qt4/src/widgets/tqlistbox.cpp
Unescape View File

@ -3074,7 +3074,7 @@ void TQListBox::emitChangedSignal( bool )
/*! \reimp */ /*! \reimp */
TQSize TQListBox::sizeHint() const TQSize TQListBox::tqsizeHint() const
{ {
if ( cachedSizeHint().isValid() ) if ( cachedSizeHint().isValid() )
return cachedSizeHint(); return cachedSizeHint();

2
tqtinterface/qt4/src/widgets/tqlistbox.h
Unescape View File

@ -136,7 +136,7 @@ public:
bool isSelected( const TQListBoxItem * ) const; bool isSelected( const TQListBoxItem * ) const;
TQListBoxItem* selectedItem() const; TQListBoxItem* selectedItem() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQListBoxItem *item( int index ) const; TQListBoxItem *item( int index ) const;

8
tqtinterface/qt4/src/widgets/tqlistview.cpp
Unescape View File

@ -3249,7 +3249,7 @@ void TQListView::clear()
delete c; delete c;
c = n; c = n;
} }
resizeContents( d->h->sizeHint().width(), contentsHeight() ); resizeContents( d->h->tqsizeHint().width(), contentsHeight() );
delete d->r; delete d->r;
d->r = 0; d->r = 0;
TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this );
@ -3640,7 +3640,7 @@ void TQListView::updateGeometries()
if ( d->h->isHidden() ) { if ( d->h->isHidden() ) {
setMargins( 0, 0, 0, 0 ); setMargins( 0, 0, 0, 0 );
} else { } else {
TQSize hs( d->h->sizeHint() ); TQSize hs( d->h->tqsizeHint() );
setMargins( 0, hs.height(), 0, 0 ); setMargins( 0, hs.height(), 0, 0 );
d->h->setGeometry( viewport()->x(), viewport()->y()-hs.height(), d->h->setGeometry( viewport()->x(), viewport()->y()-hs.height(),
visibleWidth(), hs.height() ); visibleWidth(), hs.height() );
@ -6844,7 +6844,7 @@ void TQCheckListItem::paintFocus( TQPainter *p, const TQColorGroup & cg,
/*! /*!
\reimp \reimp
*/ */
TQSize TQListView::sizeHint() const TQSize TQListView::tqsizeHint() const
{ {
if ( cachedSizeHint().isValid() ) if ( cachedSizeHint().isValid() )
return cachedSizeHint(); return cachedSizeHint();
@ -6855,7 +6855,7 @@ TQSize TQListView::sizeHint() const
// force the column widths to sanity, if possible // force the column widths to sanity, if possible
buildDrawableList(); buildDrawableList();
TQSize s( d->h->sizeHint() ); TQSize s( d->h->tqsizeHint() );
if ( verticalScrollBar()->isVisible() ) if ( verticalScrollBar()->isVisible() )
s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) );
s += TQSize(frameWidth()*2,frameWidth()*2); s += TQSize(frameWidth()*2,frameWidth()*2);

2
tqtinterface/qt4/src/widgets/tqlistview.h
Unescape View File

@ -341,7 +341,7 @@ public:
virtual bool eventFilter( TQObject * o, TQEvent * ); virtual bool eventFilter( TQObject * o, TQEvent * );
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
virtual void setShowSortIndicator( bool show ); virtual void setShowSortIndicator( bool show );

18
tqtinterface/qt4/src/widgets/tqmainwindow.cpp
Unescape View File

@ -140,7 +140,7 @@ public:
void setRightDock( TQDockArea *r ); void setRightDock( TQDockArea *r );
void setCentralWidget( TQWidget *w ); void setCentralWidget( TQWidget *w );
bool hasHeightForWidth() const { return FALSE; } bool hasHeightForWidth() const { return FALSE; }
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQLayoutIterator iterator(); TQLayoutIterator iterator();
TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::BothDirections; } TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::BothDirections; }
@ -189,23 +189,23 @@ TQLayoutItem* TQMainWindowLayout::takeAt(int index) {
return 0; return 0;
} }
TQSize TQMainWindowLayout::sizeHint() const TQSize TQMainWindowLayout::tqsizeHint() const
{ {
int w = 0; int w = 0;
int h = 0; int h = 0;
if ( left ) { if ( left ) {
w += left->sizeHint().width(); w += left->tqsizeHint().width();
h = TQMAX( h, left->sizeHint().height() ); h = TQMAX( h, left->tqsizeHint().height() );
} }
if ( right ) { if ( right ) {
w += right->sizeHint().width(); w += right->tqsizeHint().width();
h = TQMAX( h, right->sizeHint().height() ); h = TQMAX( h, right->tqsizeHint().height() );
} }
if ( central ) { if ( central ) {
w += central->sizeHint().width(); w += central->tqsizeHint().width();
int diff = extraPixels(); int diff = extraPixels();
h = TQMAX( h, central->sizeHint().height() + diff ); h = TQMAX( h, central->tqsizeHint().height() + diff );
} }
return TQSize( w, h ); return TQSize( w, h );
@ -1566,7 +1566,7 @@ void TQMainWindow::hide()
/*! \reimp */ /*! \reimp */
TQSize TQMainWindow::sizeHint() const TQSize TQMainWindow::tqsizeHint() const
{ {
TQMainWindow* that = (TQMainWindow*) this; TQMainWindow* that = (TQMainWindow*) this;
// Workaround: because d->tll get's deleted in // Workaround: because d->tll get's deleted in

2
tqtinterface/qt4/src/widgets/tqmainwindow.h
Unescape View File

@ -98,7 +98,7 @@ public:
void show(); void show();
void hide(); void hide();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
bool rightJustification() const; bool rightJustification() const;

18
tqtinterface/qt4/src/widgets/tqmenubar.cpp
Unescape View File

@ -734,17 +734,17 @@ void TQMenuBar::openActPopup()
TQPoint pos = r.bottomLeft() + TQPoint(0,yoffset); TQPoint pos = r.bottomLeft() + TQPoint(0,yoffset);
if( reverse ) { if( reverse ) {
pos = r.bottomRight() + TQPoint(0,yoffset); pos = r.bottomRight() + TQPoint(0,yoffset);
pos.rx() -= popup->sizeHint().width(); pos.rx() -= popup->tqsizeHint().width();
} }
int ph = popup->sizeHint().height(); int ph = popup->tqsizeHint().height();
pos = mapToGlobal(pos); pos = mapToGlobal(pos);
int sh = TQApplication::desktop()->height(); int sh = TQApplication::desktop()->height();
if ( defaultup || (pos.y() + ph > sh) ) { if ( defaultup || (pos.y() + ph > sh) ) {
TQPoint t = mapToGlobal( r.topLeft() ); TQPoint t = mapToGlobal( r.topLeft() );
if( reverse ) { if( reverse ) {
t = mapToGlobal( r.topRight() ); t = mapToGlobal( r.topRight() );
t.rx() -= popup->sizeHint().width(); t.rx() -= popup->tqsizeHint().width();
} }
t.ry() -= (TQCOORD)ph; t.ry() -= (TQCOORD)ph;
if ( !defaultup || t.y() >= 0 ) if ( !defaultup || t.y() >= 0 )
@ -940,8 +940,8 @@ int TQMenuBar::calculateRects( int max_width )
if ( mi->widget()->parentWidget() != this ) { if ( mi->widget()->parentWidget() != this ) {
mi->widget()->reparent( this, TQPoint(0,0) ); mi->widget()->reparent( this, TQPoint(0,0) );
} }
w = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; w = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).width()+2;
h = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; h = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).height()+2;
if ( i && separator < 0 ) if ( i && separator < 0 )
separator = i; separator = i;
} else if ( mi->pixmap() ) { // pixmap item } else if ( mi->pixmap() ) { // pixmap item
@ -1031,7 +1031,7 @@ int TQMenuBar::calculateRects( int max_width )
irects[i].setHeight( max_item_height ); irects[i].setHeight( max_item_height );
TQMenuItem *mi = mitems->at(i); TQMenuItem *mi = mitems->at(i);
if ( mi->widget() ) { if ( mi->widget() ) {
TQRect r ( TQPoint(0,0), mi->widget()->sizeHint() ); TQRect r ( TQPoint(0,0), mi->widget()->tqsizeHint() );
r.moveCenter( irects[i].center() ); r.moveCenter( irects[i].center() );
mi->widget()->setGeometry( r ); mi->widget()->setGeometry( r );
if( mi->widget()->isHidden() ) if( mi->widget()->isHidden() )
@ -1598,7 +1598,7 @@ void TQMenuBar::focusOutEvent( TQFocusEvent * )
\reimp \reimp
*/ */
TQSize TQMenuBar::sizeHint() const TQSize TQMenuBar::tqsizeHint() const
{ {
int h = height(); int h = height();
if ( badSize ) if ( badSize )
@ -1609,7 +1609,7 @@ TQSize TQMenuBar::sizeHint() const
s.setWidth( s.width() + irects[ i ].width() + 2 ); s.setWidth( s.width() + irects[ i ].width() + 2 );
} }
s.setHeight( h ); s.setHeight( h );
return (tqstyle().sizeFromContents(TQStyle::CT_MenuBar, this, s. return (tqstyle().tqsizeFromContents(TQStyle::CT_MenuBar, this, s.
expandedTo(TQApplication::globalStrut()))); expandedTo(TQApplication::globalStrut())));
} }
@ -1622,7 +1622,7 @@ TQSize TQMenuBar::tqminimumSize() const
#ifndef TQT_NO_TOOLBAR #ifndef TQT_NO_TOOLBAR
TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent()); TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent());
if ( tb ) if ( tb )
return sizeHint(); return tqsizeHint();
#endif #endif
return TQFrame::tqminimumSize(); return TQFrame::tqminimumSize();
} }

2
tqtinterface/qt4/src/widgets/tqmenubar.h
Unescape View File

@ -81,7 +81,7 @@ public:
bool customWhatsThis() const; bool customWhatsThis() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;

4
tqtinterface/qt4/src/widgets/tqmenudata.cpp
Unescape View File

@ -1471,7 +1471,7 @@ TQString TQMenuData::whatsThis( int id ) const
\ingroup misc \ingroup misc
A custom menu item is a menu item that is defined by two pure A custom menu item is a menu item that is defined by two pure
virtual functions, paint() and sizeHint(). The size hint tells the virtual functions, paint() and tqsizeHint(). The size hint tells the
menu how much space it needs to reserve for this item, and paint menu how much space it needs to reserve for this item, and paint
is called whenever the item needs painting. is called whenever the item needs painting.
@ -1575,7 +1575,7 @@ bool TQCustomMenuItem::isSeparator() const
/*! /*!
\fn TQSize TQCustomMenuItem::sizeHint(); \fn TQSize TQCustomMenuItem::tqsizeHint();
Returns the item's size hint. Returns the item's size hint.
*/ */

2
tqtinterface/qt4/src/widgets/tqmenudata.h
Unescape View File

@ -133,7 +133,7 @@ public:
virtual void setFont( const TQFont& font ); virtual void setFont( const TQFont& font );
virtual void paint( TQPainter* p, const TQColorGroup& cg, bool act, virtual void paint( TQPainter* p, const TQColorGroup& cg, bool act,
bool enabled, int x, int y, int w, int h ) = 0; bool enabled, int x, int y, int w, int h ) = 0;
virtual TQSize sizeHint() = 0; virtual TQSize tqsizeHint() = 0;
}; };

46
tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
Unescape View File

@ -483,7 +483,7 @@ void TQPopupMenu::frameChanged()
you cannot rely on the popup menu's current size(). For you cannot rely on the popup menu's current size(). For
performance reasons, the popup adapts its size only when performance reasons, the popup adapts its size only when
necessary, so in many cases, the size before and after the show is necessary, so in many cases, the size before and after the show is
different. Instead, use sizeHint(). It calculates the proper size different. Instead, use tqsizeHint(). It calculates the proper size
depending on the menu's current contents. depending on the menu's current contents.
*/ */
@ -613,7 +613,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
register TQMenuItem *mi = NULL; register TQMenuItem *mi = NULL;
TQMenuItemListIt it(*mitems); TQMenuItemListIt it(*mitems);
for(int tmp_y = 0; tmp_y < off_top && (mi=it.current()); ) { for(int tmp_y = 0; tmp_y < off_top && (mi=it.current()); ) {
TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemHeight( mi )), TQSize(0, itemHeight( mi )),
TQStyleOption(mi,maxPMWidth,0)); TQStyleOption(mi,maxPMWidth,0));
tmp_y += sz.height(); tmp_y += sz.height();
@ -940,7 +940,7 @@ int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const
} }
int itemh = itemHeight( mi ); int itemh = itemHeight( mi );
sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQSize(0, itemh),
TQStyleOption(mi,maxPMWidth)); TQStyleOption(mi,maxPMWidth));
sz = sz.expandedTo(TQSize(itemw, sz.height())); sz = sz.expandedTo(TQSize(itemw, sz.height()));
@ -999,7 +999,7 @@ TQRect TQPopupMenu::itemGeometry( int index )
} }
int itemh = itemHeight( mi ); int itemh = itemHeight( mi );
sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQSize(0, itemh),
TQStyleOption(mi,maxPMWidth)); TQStyleOption(mi,maxPMWidth));
sz = sz.expandedTo(TQSize(itemw, sz.height())); sz = sz.expandedTo(TQSize(itemw, sz.height()));
@ -1086,7 +1086,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
int itemHeight = TQPopupMenu::itemHeight( mi ); int itemHeight = TQPopupMenu::itemHeight( mi );
if ( mi->widget() ) { if ( mi->widget() ) {
TQSize s( mi->widget()->sizeHint() ); TQSize s( mi->widget()->tqsizeHint() );
s = s.expandedTo( mi->widget()->tqminimumSize() ); s = s.expandedTo( mi->widget()->tqminimumSize() );
mi->widget()->resize( s ); mi->widget()->resize( s );
if ( s.width() > maxWidgetWidth ) if ( s.width() > maxWidgetWidth )
@ -1097,9 +1097,9 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
if ( mi->custom() ) { if ( mi->custom() ) {
if ( mi->custom()->fullSpan() ) { if ( mi->custom()->fullSpan() ) {
maxWidgetWidth = TQMAX( maxWidgetWidth, maxWidgetWidth = TQMAX( maxWidgetWidth,
mi->custom()->sizeHint().width() ); mi->custom()->tqsizeHint().width() );
} else { } else {
TQSize s ( mi->custom()->sizeHint() ); TQSize s ( mi->custom()->tqsizeHint() );
w += s.width(); w += s.width();
} }
} }
@ -1125,14 +1125,14 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
w += mi->pixmap()->width(); w += mi->pixmap()->width();
} else { } else {
if ( mi->custom() ) { if ( mi->custom() ) {
TQSize s ( mi->custom()->sizeHint() ); TQSize s ( mi->custom()->tqsizeHint() );
w += s.width(); w += s.width();
} else { } else {
w = itemHeight = 2; w = itemHeight = 2;
} }
} }
TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(w, itemHeight), TQSize(w, itemHeight),
TQStyleOption(mi,maxPMWidth)); TQStyleOption(mi,maxPMWidth));
@ -1202,7 +1202,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
int itemh = itemHeight( mi ); int itemh = itemHeight( mi );
sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); TQSize(0, itemh), TQStyleOption(mi,maxPMWidth));
sz = sz.expandedTo(TQSize(itemw, sz.height())); sz = sz.expandedTo(TQSize(itemw, sz.height()));
itemw = sz.width(); itemw = sz.width();
@ -1439,7 +1439,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const
if ( mi->widget() ) if ( mi->widget() )
return mi->widget()->height(); return mi->widget()->height();
if ( mi->custom() && mi->custom()->fullSpan() ) if ( mi->custom() && mi->custom()->fullSpan() )
return mi->custom()->sizeHint().height(); return mi->custom()->tqsizeHint().height();
TQFontMetrics fm(fontMetrics()); TQFontMetrics fm(fontMetrics());
int h = 0; int h = 0;
@ -1454,7 +1454,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const
h = TQMAX(h, mi->iconSet()->pixmap( TQIconSet::Small, h = TQMAX(h, mi->iconSet()->pixmap( TQIconSet::Small,
TQIconSet::Normal ).height()); TQIconSet::Normal ).height());
if ( mi->custom() ) if ( mi->custom() )
h = TQMAX(h, mi->custom()->sizeHint().height()); h = TQMAX(h, mi->custom()->tqsizeHint().height());
return h; return h;
} }
@ -1536,7 +1536,7 @@ void TQPopupMenu::drawContents( TQPainter* p )
continue; continue;
} }
int itemh = itemHeight( mi ); int itemh = itemHeight( mi );
sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQSize(0, itemh),
TQStyleOption(mi,maxPMWidth,0) TQStyleOption(mi,maxPMWidth,0)
); );
@ -2157,7 +2157,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
for(int i = 0, y = ((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp) ? sh : 0); it.current(); i++, ++it) { for(int i = 0, y = ((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp) ? sh : 0); it.current(); i++, ++it) {
if(i >= d->scroll.topScrollableIndex) { if(i >= d->scroll.topScrollableIndex) {
int itemh = itemHeight(it.current()); int itemh = itemHeight(it.current());
TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQSize(0, itemh),
TQStyleOption(it.current(),maxPMWidth,0)); TQStyleOption(it.current(),maxPMWidth,0));
y += sz.height(); y += sz.height();
@ -2235,7 +2235,7 @@ void TQPopupMenu::enabledChange( bool )
This functions returns the number of columns necessary. This functions returns the number of columns necessary.
\sa sizeHint() \sa tqsizeHint()
*/ */
int TQPopupMenu::columns() const int TQPopupMenu::columns() const
{ {
@ -2278,7 +2278,7 @@ void TQPopupMenu::subScrollTimer() {
for(int i = 0, y = contentsRect().y() + sh; it.current(); i++, ++it) { for(int i = 0, y = contentsRect().y() + sh; it.current(); i++, ++it) {
if(i >= d->scroll.topScrollableIndex) { if(i >= d->scroll.topScrollableIndex) {
int itemh = itemHeight(it.current()); int itemh = itemHeight(it.current());
TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh),
TQStyleOption(it.current(),maxPMWidth,0)); TQStyleOption(it.current(),maxPMWidth,0));
y += sz.height(); y += sz.height();
if(y > contentsRect().height() - sh) { if(y > contentsRect().height() - sh) {
@ -2328,7 +2328,7 @@ void TQPopupMenu::subMenuTimer() {
TQRect r( itemGeometry( actItem ) ); TQRect r( itemGeometry( actItem ) );
TQPoint p; TQPoint p;
TQSize ps = popup->sizeHint(); TQSize ps = popup->tqsizeHint();
if( TQApplication::reverseLayout() ) { if( TQApplication::reverseLayout() ) {
p = TQPoint( r.left() + motifArrowHMargin - ps.width(), r.top() + motifArrowVMargin ); p = TQPoint( r.left() + motifArrowHMargin - ps.width(), r.top() + motifArrowVMargin );
p = mapToGlobal( p ); p = mapToGlobal( p );
@ -2440,10 +2440,10 @@ void TQPopupMenu::updateRow( int row )
you cannot rely on the popup menu's current size(). For you cannot rely on the popup menu's current size(). For
performance reasons, the popup adapts its size only when performance reasons, the popup adapts its size only when
necessary. So in many cases, the size before and after the show is necessary. So in many cases, the size before and after the show is
different. Instead, use sizeHint(). It calculates the proper size different. Instead, use tqsizeHint(). It calculates the proper size
depending on the menu's current contents. depending on the menu's current contents.
\sa popup(), sizeHint() \sa popup(), tqsizeHint()
*/ */
int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint ) int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint )
@ -2564,11 +2564,11 @@ void TQPopupMenu::setActiveItem( int i )
/*! /*!
\reimp \reimp
*/ */
TQSize TQPopupMenu::sizeHint() const TQSize TQPopupMenu::tqsizeHint() const
{ {
constPolish(); constPolish();
TQPopupMenu* that = (TQPopupMenu*) this; TQPopupMenu* that = (TQPopupMenu*) this;
//We do not need a resize here, just the sizeHint.. //We do not need a resize here, just the tqsizeHint..
return that->updateSize(FALSE, FALSE).expandedTo( TQApplication::globalStrut() ); return that->updateSize(FALSE, FALSE).expandedTo( TQApplication::globalStrut() );
} }
@ -2674,7 +2674,7 @@ public:
return TRUE; return TRUE;
} }
TQSize sizeHint() TQSize tqsizeHint()
{ {
return TQSize( 20, 6 ); return TQSize( 20, 6 );
} }
@ -2834,7 +2834,7 @@ TQPopupMenu::updateScrollerState()
while ( (mi=it.current()) ) { while ( (mi=it.current()) ) {
++it; ++it;
int myheight = contentsRect().height(); int myheight = contentsRect().height();
TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemHeight( mi )), TQSize(0, itemHeight( mi )),
TQStyleOption(mi,maxPMWidth)); TQStyleOption(mi,maxPMWidth));
if(y + sz.height() >= myheight) { if(y + sz.height() >= myheight) {

2
tqtinterface/qt4/src/widgets/tqpopupmenu.h
Unescape View File

@ -72,7 +72,7 @@ public:
int exec( const TQPoint & pos, int indexAtPoint = 0 ); // modal int exec( const TQPoint & pos, int indexAtPoint = 0 ); // modal
virtual void setActiveItem( int ); virtual void setActiveItem( int );
TQSize sizeHint() const; TQSize tqsizeHint() const;
int idAt( int index ) const { return TQMenuData::idAt( index ); } int idAt( int index ) const { return TQMenuData::idAt( index ); }
int idAt( const TQPoint& pos ) const; int idAt( const TQPoint& pos ) const;

6
tqtinterface/qt4/src/widgets/tqprogressbar.cpp
Unescape View File

@ -229,12 +229,12 @@ void TQProgressBar::setProgress( int progress, int totalSteps )
/*! /*!
\reimp \reimp
*/ */
TQSize TQProgressBar::sizeHint() const TQSize TQProgressBar::tqsizeHint() const
{ {
constPolish(); constPolish();
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
int cw = tqstyle().tqpixelMetric(TQStyle::PM_ProgressBarChunkWidth, this); int cw = tqstyle().tqpixelMetric(TQStyle::PM_ProgressBarChunkWidth, this);
return tqstyle().sizeFromContents(TQStyle::CT_ProgressBar, this, return tqstyle().tqsizeFromContents(TQStyle::CT_ProgressBar, this,
TQSize( cw * 7 + fm.width( '0' ) * 4, TQSize( cw * 7 + fm.width( '0' ) * 4,
fm.height() + 8)); fm.height() + 8));
} }
@ -245,7 +245,7 @@ TQSize TQProgressBar::sizeHint() const
*/ */
TQSize TQProgressBar::tqminimumSizeHint() const TQSize TQProgressBar::tqminimumSizeHint() const
{ {
return sizeHint(); return tqsizeHint();
} }
/*! /*!

2
tqtinterface/qt4/src/widgets/tqprogressbar.h
Unescape View File

@ -70,7 +70,7 @@ public:
int progress() const; int progress() const;
const TQString &progressString() const; const TQString &progressString() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void setCenterIndicator( bool on ); void setCenterIndicator( bool on );

16
tqtinterface/qt4/src/widgets/tqpushbutton.cpp
Unescape View File

@ -402,7 +402,7 @@ void TQPushButton::setDefault( bool enable )
/*! /*!
\reimp \reimp
*/ */
TQSize TQPushButton::sizeHint() const TQSize TQPushButton::tqsizeHint() const
{ {
constPolish(); constPolish();
@ -437,7 +437,7 @@ TQSize TQPushButton::sizeHint() const
h = TQMAX(h, sz.height()); h = TQMAX(h, sz.height());
} }
return (tqstyle().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(w, h)). return (tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }
@ -712,24 +712,24 @@ void TQPushButton::popupPressed()
#endif #endif
if ( horizontal ) { if ( horizontal ) {
if ( topLeft ) { if ( topLeft ) {
if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->sizeHint().height() <= tqApp->desktop()->height() ) if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->tqsizeHint().height() <= tqApp->desktop()->height() )
popup->exec( mapToGlobal( rect().bottomLeft() ) ); popup->exec( mapToGlobal( rect().bottomLeft() ) );
else else
popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->sizeHint().height() ) ) ); popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->tqsizeHint().height() ) ) );
} else { } else {
TQSize sz( popup->sizeHint() ); TQSize sz( popup->tqsizeHint() );
TQPoint p = mapToGlobal( rect().topLeft() ); TQPoint p = mapToGlobal( rect().topLeft() );
p.ry() -= sz.height(); p.ry() -= sz.height();
popup->exec( p ); popup->exec( p );
} }
} else { } else {
if ( topLeft ) { if ( topLeft ) {
if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->sizeHint().width() <= tqApp->desktop()->width() ) if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->tqsizeHint().width() <= tqApp->desktop()->width() )
popup->exec( mapToGlobal( rect().topRight() ) ); popup->exec( mapToGlobal( rect().topRight() ) );
else else
popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->sizeHint().width(), 0 ) ) ); popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->tqsizeHint().width(), 0 ) ) );
} else { } else {
TQSize sz( popup->sizeHint() ); TQSize sz( popup->tqsizeHint() );
TQPoint p = mapToGlobal( rect().topLeft() ); TQPoint p = mapToGlobal( rect().topLeft() );
p.rx() -= sz.width(); p.rx() -= sz.width();
popup->exec( p ); popup->exec( p );

2
tqtinterface/qt4/src/widgets/tqpushbutton.h
Unescape View File

@ -72,7 +72,7 @@ public:
#endif #endif
~TQPushButton(); ~TQPushButton();
TQSize sizeHint() const; TQSize tqsizeHint() const;
void move( int x, int y ); void move( int x, int y );
void move( const TQPoint &p ); void move( const TQPoint &p );

8
tqtinterface/qt4/src/widgets/tqradiobutton.cpp
Unescape View File

@ -156,17 +156,17 @@ void TQRadioButton::setChecked( bool check )
/*! /*!
\reimp \reimp
*/ */
TQSize TQRadioButton::sizeHint() const TQSize TQRadioButton::tqsizeHint() const
{ {
// Any more complex, and we will use tqstyle().tqitemRect() // Any more complex, and we will use tqstyle().tqitemRect()
// NB: TQCheckBox::sizeHint() is similar // NB: TQCheckBox::tqsizeHint() is similar
constPolish(); constPolish();
TQPainter p(this); TQPainter p(this);
TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE,
pixmap(), text()).size(); pixmap(), text()).size();
return (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, sz). return (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, sz).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }
@ -321,7 +321,7 @@ void TQRadioButton::resizeEvent( TQResizeEvent* e )
TQPainter p(this); TQPainter p(this);
TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE,
pixmap(), text()).size(); pixmap(), text()).size();
TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, isz). TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, isz).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
update(wsz.width(), isz.width(), 0, wsz.height()); update(wsz.width(), isz.width(), 0, wsz.height());

2
tqtinterface/qt4/src/widgets/tqradiobutton.h
Unescape View File

@ -60,7 +60,7 @@ public:
bool isChecked() const; bool isChecked() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
public Q_SLOTS: public Q_SLOTS:
virtual void setChecked( bool check ); virtual void setChecked( bool check );

4
tqtinterface/qt4/src/widgets/tqscrollbar.cpp
Unescape View File

@ -319,7 +319,7 @@ void TQScrollBar::setOrientation( Qt::Orientation orientation )
if ( orientation == orient ) if ( orientation == orient )
return; return;
if ( !testWState( TQt::WState_OwnSizePolicy ) ) { if ( !testWState( TQt::WState_OwnSizePolicy ) ) {
TQSizePolicy sp = sizePolicy(); TQSizePolicy sp = tqsizePolicy();
sp.transpose(); sp.transpose();
tqsetSizePolicy( sp ); tqsetSizePolicy( sp );
clearWState( TQt::WState_OwnSizePolicy ); clearWState( TQt::WState_OwnSizePolicy );
@ -371,7 +371,7 @@ void TQScrollBar::setPalette( const TQPalette &p )
/*! \reimp */ /*! \reimp */
TQSize TQScrollBar::sizeHint() const TQSize TQScrollBar::tqsizeHint() const
{ {
constPolish(); constPolish();
int sbextent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this); int sbextent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this);

2
tqtinterface/qt4/src/widgets/tqscrollbar.h
Unescape View File

@ -77,7 +77,7 @@ public:
bool draggingSlider() const; bool draggingSlider() const;
virtual void setPalette( const TQPalette & ); virtual void setPalette( const TQPalette & );
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
virtual void tqsetSizePolicy( TQSizePolicy sp ); virtual void tqsetSizePolicy( TQSizePolicy sp );
void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE );

38
tqtinterface/qt4/src/widgets/tqscrollview.cpp
Unescape View File

@ -176,7 +176,7 @@ public:
bool anyVisibleChildren(); bool anyVisibleChildren();
void autoMove(TQScrollView* sv); void autoMove(TQScrollView* sv);
void autoResize(TQScrollView* sv); void autoResize(TQScrollView* sv);
void autoResizeHint(TQScrollView* sv); void autoRetqsizeHint(TQScrollView* sv);
void viewportResized( int w, int h ); void viewportResized( int w, int h );
TQScrollBar* hbar; TQScrollBar* hbar;
@ -314,19 +314,19 @@ void TQScrollViewData::autoResize(TQScrollView* sv)
} }
} }
void TQScrollViewData::autoResizeHint(TQScrollView* sv) void TQScrollViewData::autoRetqsizeHint(TQScrollView* sv)
{ {
if ( policy == TQScrollView::AutoOne ) { if ( policy == TQScrollView::AutoOne ) {
TQSVChildRec* r = tqchildren.first(); TQSVChildRec* r = tqchildren.first();
if (r) { if (r) {
TQSize s = r->child->sizeHint(); TQSize s = r->child->tqsizeHint();
if ( s.isValid() ) if ( s.isValid() )
r->child->resize(s); r->child->resize(s);
} }
} else if ( policy == TQScrollView::AutoOneFit ) { } else if ( policy == TQScrollView::AutoOneFit ) {
TQSVChildRec* r = tqchildren.first(); TQSVChildRec* r = tqchildren.first();
if (r) { if (r) {
TQSize sh = r->child->sizeHint(); TQSize sh = r->child->tqsizeHint();
sh = sh.boundedTo( r->child->tqmaximumSize() ); sh = sh.boundedTo( r->child->tqmaximumSize() );
sv->resizeContents( sh.width(), sh.height() ); sv->resizeContents( sh.width(), sh.height() );
} }
@ -338,7 +338,7 @@ void TQScrollViewData::viewportResized( int w, int h )
if ( policy == TQScrollView::AutoOneFit ) { if ( policy == TQScrollView::AutoOneFit ) {
TQSVChildRec* r = tqchildren.first(); TQSVChildRec* r = tqchildren.first();
if (r) { if (r) {
TQSize sh = r->child->sizeHint(); TQSize sh = r->child->tqsizeHint();
sh = sh.boundedTo( r->child->tqmaximumSize() ); sh = sh.boundedTo( r->child->tqmaximumSize() );
r->child->resize( TQMAX(w,sh.width()), TQMAX(h,sh.height()) ); r->child->resize( TQMAX(w,sh.width()), TQMAX(h,sh.height()) );
} }
@ -562,12 +562,12 @@ void TQScrollViewData::viewportResized( int w, int h )
the size of that widget. Otherwise the behavior is undefined. the size of that widget. Otherwise the behavior is undefined.
\value AutoOneFit if there is only one child widget the contents stays \value AutoOneFit if there is only one child widget the contents stays
the size of that widget's sizeHint(). If the scrollview is resized the size of that widget's tqsizeHint(). If the scrollview is resized
larger than the child's sizeHint(), the child will be resized to larger than the child's tqsizeHint(), the child will be resized to
fit. If there is more than one child, the behavior is undefined. fit. If there is more than one child, the behavior is undefined.
*/ */
//#### The widget will be resized to its sizeHint() when a LayoutHint event //#### The widget will be resized to its tqsizeHint() when a LayoutHint event
//#### is received //#### is received
/*! /*!
@ -794,8 +794,8 @@ TQSize TQScrollView::viewportSize( int x, int y ) const
bool needh, needv; bool needh, needv;
bool showh, showv; bool showh, showv;
int hsbExt = horizontalScrollBar()->sizeHint().height(); int hsbExt = horizontalScrollBar()->tqsizeHint().height();
int vsbExt = verticalScrollBar()->sizeHint().width(); int vsbExt = verticalScrollBar()->tqsizeHint().width();
if ( d->policy != AutoOne || d->anyVisibleChildren() ) { if ( d->policy != AutoOne || d->anyVisibleChildren() ) {
// Do we definitely need the scrollbar? // Do we definitely need the scrollbar?
@ -865,8 +865,8 @@ void TQScrollView::updateScrollBars()
bool showv; bool showv;
bool showc = FALSE; bool showc = FALSE;
int hsbExt = horizontalScrollBar()->sizeHint().height(); int hsbExt = horizontalScrollBar()->tqsizeHint().height();
int vsbExt = verticalScrollBar()->sizeHint().width(); int vsbExt = verticalScrollBar()->tqsizeHint().width();
TQSize oldVisibleSize( visibleWidth(), visibleHeight() ); TQSize oldVisibleSize( visibleWidth(), visibleHeight() );
@ -1401,7 +1401,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y)
if (r) { if (r) {
r->moveTo(this,x,y,d->clipped_viewport); r->moveTo(this,x,y,d->clipped_viewport);
if ( d->policy > Manual ) { if ( d->policy > Manual ) {
d->autoResizeHint(this); d->autoRetqsizeHint(this);
d->autoResize(this); // #### better to just deal with this one widget! d->autoResize(this); // #### better to just deal with this one widget!
} }
return; return;
@ -1422,7 +1422,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y)
d->addChildRec(child,x,y)->hideOrShow(this, d->clipped_viewport); d->addChildRec(child,x,y)->hideOrShow(this, d->clipped_viewport);
if ( d->policy > Manual ) { if ( d->policy > Manual ) {
d->autoResizeHint(this); d->autoRetqsizeHint(this);
d->autoResize(this); // #### better to just deal with this one widget! d->autoResize(this); // #### better to just deal with this one widget!
} }
} }
@ -1551,7 +1551,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e )
removeChild((TQWidget*)((TQChildEvent*)e)->child()); removeChild((TQWidget*)((TQChildEvent*)e)->child());
break; break;
case TQEvent::LayoutHint: case TQEvent::LayoutHint:
d->autoResizeHint(this); d->autoRetqsizeHint(this);
break; break;
default: default:
break; break;
@ -2688,7 +2688,7 @@ void TQScrollView::viewportToContents( int vx, int vy, int& x, int& y ) const
/*! /*!
\reimp \reimp
*/ */
TQSize TQScrollView::sizeHint() const TQSize TQScrollView::tqsizeHint() const
{ {
if ( d->use_cached_size_hint && d->cachedSizeHint.isValid() ) if ( d->use_cached_size_hint && d->cachedSizeHint.isValid() )
return d->cachedSizeHint; return d->cachedSizeHint;
@ -2700,7 +2700,7 @@ TQSize TQScrollView::sizeHint() const
if ( d->policy > Manual ) { if ( d->policy > Manual ) {
TQSVChildRec *r = d->tqchildren.first(); TQSVChildRec *r = d->tqchildren.first();
if ( r ) { if ( r ) {
TQSize cs = r->child->sizeHint(); TQSize cs = r->child->tqsizeHint();
if ( cs.isValid() ) if ( cs.isValid() )
sz += cs.boundedTo( r->child->tqmaximumSize() ); sz += cs.boundedTo( r->child->tqmaximumSize() );
else else
@ -2710,9 +2710,9 @@ TQSize TQScrollView::sizeHint() const
sz += TQSize( d->contentsWidth(), contentsHeight() ); sz += TQSize( d->contentsWidth(), contentsHeight() );
} }
if (d->vMode == AlwaysOn) if (d->vMode == AlwaysOn)
sz.setWidth(sz.width() + d->vbar->sizeHint().width()); sz.setWidth(sz.width() + d->vbar->tqsizeHint().width());
if (d->hMode == AlwaysOn) if (d->hMode == AlwaysOn)
sz.setHeight(sz.height() + d->hbar->sizeHint().height()); sz.setHeight(sz.height() + d->hbar->tqsizeHint().height());
return sz.expandedTo( TQSize(12 * h, 8 * h) ) return sz.expandedTo( TQSize(12 * h, 8 * h) )
.boundedTo( TQSize(36 * h, 24 * h) ); .boundedTo( TQSize(36 * h, 24 * h) );
} }

2
tqtinterface/qt4/src/widgets/tqscrollview.h
Unescape View File

@ -135,7 +135,7 @@ public:
bool hasStaticBackground() const; bool hasStaticBackground() const;
TQSize viewportSize( int, int ) const; TQSize viewportSize( int, int ) const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void removeChild(TQObject* child); void removeChild(TQObject* child);

8
tqtinterface/qt4/src/widgets/tqslider.cpp
Unescape View File

@ -729,7 +729,7 @@ int TQSlider::goodPart( const TQPoint &p ) const
/*! /*!
\reimp \reimp
*/ */
TQSize TQSlider::sizeHint() const TQSize TQSlider::tqsizeHint() const
{ {
constPolish(); constPolish();
const int length = 84, tickSpace = 5; const int length = 84, tickSpace = 5;
@ -743,7 +743,7 @@ TQSize TQSlider::sizeHint() const
w = length; w = length;
h = thick; h = thick;
} }
return (tqstyle().sizeFromContents(TQStyle::CT_Slider, this, return (tqstyle().tqsizeFromContents(TQStyle::CT_Slider, this,
TQSize(w, h)).expandedTo(TQApplication::globalStrut())); TQSize(w, h)).expandedTo(TQApplication::globalStrut()));
} }
@ -755,7 +755,7 @@ TQSize TQSlider::sizeHint() const
TQSize TQSlider::tqminimumSizeHint() const TQSize TQSlider::tqminimumSizeHint() const
{ {
TQSize s = sizeHint(); TQSize s = tqsizeHint();
int length = tqstyle().tqpixelMetric(TQStyle::PM_SliderLength, this); int length = tqstyle().tqpixelMetric(TQStyle::PM_SliderLength, this);
if ( orient == Qt::Horizontal ) if ( orient == Qt::Horizontal )
s.setWidth( length ); s.setWidth( length );
@ -780,7 +780,7 @@ void TQSlider::tqsetSizePolicy( TQSizePolicy sp )
TQSizePolicy TQSlider::sizePolicy() const TQSizePolicy TQSlider::sizePolicy() const
{ {
// ### 4.0 remove this reimplementation // ### 4.0 remove this reimplementation
return TQWidget::sizePolicy(); return TQWidget::tqsizePolicy();
} }
/*! /*!

2
tqtinterface/qt4/src/widgets/tqslider.h
Unescape View File

@ -85,7 +85,7 @@ public:
int sliderStart() const; int sliderStart() const;
TQRect sliderRect() const; TQRect sliderRect() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
void tqsetSizePolicy( TQSizePolicy sp ); void tqsetSizePolicy( TQSizePolicy sp );
void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE );

6
tqtinterface/qt4/src/widgets/tqspinbox.cpp
Unescape View File

@ -496,10 +496,10 @@ bool TQSpinBox::wrapping() const
/*! /*!
\reimp \reimp
*/ */
TQSize TQSpinBox::sizeHint() const TQSize TQSpinBox::tqsizeHint() const
{ {
constPolish(); constPolish();
TQSize sz = vi->sizeHint(); TQSize sz = vi->tqsizeHint();
int h = sz.height(); int h = sz.height();
TQFontMetrics fm( font() ); TQFontMetrics fm( font() );
int w = 35; int w = 35;
@ -513,7 +513,7 @@ TQSize TQSpinBox::sizeHint() const
s = specialValueText(); s = specialValueText();
w = TQMAX( w, fm.width( s ) + wx ); w = TQMAX( w, fm.width( s ) + wx );
} }
return tqstyle().sizeFromContents(TQStyle::CT_SpinBox, this, return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
TQSize( w + d->controls->downRect().width(), TQSize( w + d->controls->downRect().width(),
h + tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) * 2). h + tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) * 2).
expandedTo( TQApplication::globalStrut() )); expandedTo( TQApplication::globalStrut() ));

2
tqtinterface/qt4/src/widgets/tqspinbox.h
Unescape View File

@ -94,7 +94,7 @@ public:
virtual void setValidator( const TQValidator* v ); virtual void setValidator( const TQValidator* v );
const TQValidator * validator() const; const TQValidator * validator() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
int minValue() const; int minValue() const;

26
tqtinterface/qt4/src/widgets/tqsplitter.cpp
Unescape View File

@ -63,7 +63,7 @@ public:
bool opaque() const { return s->opaqueResize(); } bool opaque() const { return s->opaqueResize(); }
TQSize sizeHint() const; TQSize tqsizeHint() const;
int id() const { return myId; } // d->list.at(id())->wid == this int id() const { return myId; } // d->list.at(id())->wid == this
void setId( int i ) { myId = i; } void setId( int i ) { myId = i; }
@ -126,10 +126,10 @@ TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent,
setOrientation( o ); setOrientation( o );
} }
TQSize TQSplitterHandle::sizeHint() const TQSize TQSplitterHandle::tqsizeHint() const
{ {
int hw = s->handleWidth(); int hw = s->handleWidth();
return parentWidget()->tqstyle().sizeFromContents( TQStyle::CT_Splitter, s, return parentWidget()->tqstyle().tqsizeFromContents( TQStyle::CT_Splitter, s,
TQSize(hw, hw) ) TQSize(hw, hw) )
.expandedTo( TQApplication::globalStrut() ); .expandedTo( TQApplication::globalStrut() );
} }
@ -197,7 +197,7 @@ public:
TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient ) TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient )
{ {
if ( sizer == -1 ) { if ( sizer == -1 ) {
TQSize s = wid->sizeHint(); TQSize s = wid->tqsizeHint();
if ( !s.isValid() || wid->testWState(WState_Resized) ) if ( !s.isValid() || wid->testWState(WState_Resized) )
s = wid->size(); s = wid->size();
sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height(); sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height();
@ -339,7 +339,7 @@ void TQSplitter::setOrientation( Qt::Orientation o )
return; return;
if ( !testWState( TQt::WState_OwnSizePolicy ) ) { if ( !testWState( TQt::WState_OwnSizePolicy ) ) {
TQSizePolicy sp = sizePolicy(); TQSizePolicy sp = tqsizePolicy();
sp.transpose(); sp.transpose();
tqsetSizePolicy( sp ); tqsetSizePolicy( sp );
clearWState( TQt::WState_OwnSizePolicy ); clearWState( TQt::WState_OwnSizePolicy );
@ -435,7 +435,7 @@ TQSplitterLayoutStruct *TQSplitter::addWidget( TQWidget *w, bool prepend )
s->wid = newHandle; s->wid = newHandle;
newHandle->setId( d->list.count() ); newHandle->setId( d->list.count() );
s->isHandle = TRUE; s->isHandle = TRUE;
s->sizer = pick( newHandle->sizeHint() ); s->sizer = pick( newHandle->tqsizeHint() );
if ( prepend ) if ( prepend )
d->list.prepend( s ); d->list.prepend( s );
else else
@ -852,14 +852,14 @@ void TQSplitter::doResize()
if ( s->wid->isHidden() || isCollapsed(s->wid) ) { if ( s->wid->isHidden() || isCollapsed(s->wid) ) {
a[i].tqmaximumSize = 0; a[i].tqmaximumSize = 0;
} else if ( s->isHandle ) { } else if ( s->isHandle ) {
a[i].sizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
a[i].empty = FALSE; a[i].empty = FALSE;
} else { } else {
int mode = s->resizeMode; int mode = s->resizeMode;
int stretch = 1; int stretch = 1;
if ( mode == DefaultResizeMode ) { if ( mode == DefaultResizeMode ) {
TQSizePolicy p = s->wid->sizePolicy(); TQSizePolicy p = s->wid->tqsizePolicy();
int sizePolicyStretch = int sizePolicyStretch =
pick( TQSize(p.horStretch(), p.verStretch()) ); pick( TQSize(p.horStretch(), p.verStretch()) );
if ( sizePolicyStretch > 0 ) { if ( sizePolicyStretch > 0 ) {
@ -890,11 +890,11 @@ void TQSplitter::doResize()
stretch *= s->getSizer( orient ); stretch *= s->getSizer( orient );
// TQMIN(): ad hoc work-around for tqlayout engine limitation // TQMIN(): ad hoc work-around for tqlayout engine limitation
a[i].stretch = TQMIN( stretch, 8192 ); a[i].stretch = TQMIN( stretch, 8192 );
a[i].sizeHint = a[i].tqminimumSize; a[i].tqsizeHint = a[i].tqminimumSize;
} else if ( mode == KeepSize ) { } else if ( mode == KeepSize ) {
a[i].sizeHint = s->getSizer( orient ); a[i].tqsizeHint = s->getSizer( orient );
} else { // mode == FollowSizeHint } else { // mode == FollowSizeHint
a[i].sizeHint = pick( s->wid->sizeHint() ); a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
} }
} }
} }
@ -1109,7 +1109,7 @@ void TQSplitter::recalcId()
/*! /*!
\reimp \reimp
*/ */
TQSize TQSplitter::sizeHint() const TQSize TQSplitter::tqsizeHint() const
{ {
constPolish(); constPolish();
int l = 0; int l = 0;
@ -1121,7 +1121,7 @@ TQSize TQSplitter::sizeHint() const
while( (o = it.current()) != 0 ) { while( (o = it.current()) != 0 ) {
++it; ++it;
if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) {
TQSize s = ((TQWidget*)o)->sizeHint(); TQSize s = ((TQWidget*)o)->tqsizeHint();
if ( s.isValid() ) { if ( s.isValid() ) {
l += pick( s ); l += pick( s );
t = TQMAX( t, trans( s ) ); t = TQMAX( t, trans( s ) );

2
tqtinterface/qt4/src/widgets/tqsplitter.h
Unescape View File

@ -87,7 +87,7 @@ public:
void moveToLast( TQWidget * ); void moveToLast( TQWidget * );
void refresh() { recalc( TRUE ); } void refresh() { recalc( TRUE ); }
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQValueList<int> sizes() const; TQValueList<int> sizes() const;

12
tqtinterface/qt4/src/widgets/tqstatusbar.cpp
Unescape View File

@ -47,7 +47,7 @@
#include "tqtimer.h" #include "tqtimer.h"
#include "tqdrawutil.h" #include "tqdrawutil.h"
#include "tqstyle.h" #include "tqstyle.h"
#include "sizegrip.h" #include "tqsizegrip.h"
/*! /*!
\class TQStatusBar tqstatusbar.h \class TQStatusBar tqstatusbar.h
@ -312,7 +312,7 @@ void TQStatusBar::reformat()
TQStatusBarPrivate::SBItem* item = d->items.first(); TQStatusBarPrivate::SBItem* item = d->items.first();
while ( item && !item->p ) { while ( item && !item->p ) {
l->addWidget( item->w, item->s ); l->addWidget( item->w, item->s );
int itemH = TQMIN(item->w->sizeHint().height(), int itemH = TQMIN(item->w->tqsizeHint().height(),
item->w->maximumHeight()); item->w->maximumHeight());
maxH = TQMAX( maxH, itemH ); maxH = TQMAX( maxH, itemH );
item = d->items.next(); item = d->items.next();
@ -322,7 +322,7 @@ void TQStatusBar::reformat()
while ( item ) { while ( item ) {
l->addWidget( item->w, item->s ); l->addWidget( item->w, item->s );
int itemH = TQMIN(item->w->sizeHint().height(), int itemH = TQMIN(item->w->tqsizeHint().height(),
item->w->maximumHeight()); item->w->maximumHeight());
maxH = TQMAX( maxH, itemH ); maxH = TQMAX( maxH, itemH );
item = d->items.next(); item = d->items.next();
@ -330,7 +330,7 @@ void TQStatusBar::reformat()
l->addSpacing( 4 ); l->addSpacing( 4 );
#ifndef TQT_NO_SIZEGRIP #ifndef TQT_NO_SIZEGRIP
if ( d->resizer ) { if ( d->resizer ) {
maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() );
d->box->addSpacing( 1 ); d->box->addSpacing( 1 );
d->box->addWidget( d->resizer, 0, Qt::AlignBottom ); d->box->addWidget( d->resizer, 0, Qt::AlignBottom );
} }
@ -496,7 +496,7 @@ bool TQStatusBar::event( TQEvent *e )
TQStatusBarPrivate::SBItem* item = d->items.first(); TQStatusBarPrivate::SBItem* item = d->items.first();
while ( item ) { while ( item ) {
int itemH = TQMIN(item->w->sizeHint().height(), int itemH = TQMIN(item->w->tqsizeHint().height(),
item->w->maximumHeight()); item->w->maximumHeight());
maxH = TQMAX( maxH, itemH ); maxH = TQMAX( maxH, itemH );
item = d->items.next(); item = d->items.next();
@ -504,7 +504,7 @@ bool TQStatusBar::event( TQEvent *e )
#ifndef TQT_NO_SIZEGRIP #ifndef TQT_NO_SIZEGRIP
if ( d->resizer ) if ( d->resizer )
maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() );
#endif #endif
if ( maxH != d->savedStrut ) if ( maxH != d->savedStrut )

12
tqtinterface/qt4/src/widgets/tqtabbar.cpp
Unescape View File

@ -547,7 +547,7 @@ bool TQTabBar::isTabEnabled( int id ) const
/*! /*!
\reimp \reimp
*/ */
TQSize TQTabBar::sizeHint() const TQSize TQTabBar::tqsizeHint() const
{ {
TQSize sz(0, 0); TQSize sz(0, 0);
if ( TQTab * t = l->first() ) { if ( TQTab * t = l->first() ) {
@ -566,8 +566,8 @@ TQSize TQTabBar::sizeHint() const
TQSize TQTabBar::tqminimumSizeHint() const TQSize TQTabBar::tqminimumSizeHint() const
{ {
if(tqstyle().tqstyleHint( TQStyle::SH_TabBar_PreferNoArrows, this )) if(tqstyle().tqstyleHint( TQStyle::SH_TabBar_PreferNoArrows, this ))
return sizeHint(); return tqsizeHint();
return TQSize( d->rightB->sizeHint().width() * 2 + 75, sizeHint().height() ); return TQSize( d->rightB->tqsizeHint().width() * 2 + 75, tqsizeHint().height() );
} }
/*! /*!
@ -576,7 +576,7 @@ TQSize TQTabBar::tqminimumSizeHint() const
This virtual function may be reimplemented to change the look of This virtual function may be reimplemented to change the look of
TQTabBar. If you decide to reimplement it, you may also need to TQTabBar. If you decide to reimplement it, you may also need to
reimplement sizeHint(). reimplement tqsizeHint().
*/ */
void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const
@ -1107,7 +1107,7 @@ void TQTabBar::layoutTabs()
h = TQMAX( h, TQApplication::globalStrut().height() ); h = TQMAX( h, TQApplication::globalStrut().height() );
h += vframe; h += vframe;
t->r = TQRect(TQPoint(x, 0), tqstyle().sizeFromContents(TQStyle::CT_TabBarTab, this, t->r = TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), h ), TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), h ),
TQStyleOption(t) )); TQStyleOption(t) ));
x += t->r.width() - overlap; x += t->r.width() - overlap;
@ -1129,7 +1129,7 @@ void TQTabBar::layoutTabs()
t->r.setHeight( r.height() ); t->r.setHeight( r.height() );
} }
if ( sizeHint() != oldSh ) if ( tqsizeHint() != oldSh )
updateGeometry(); updateGeometry();
emit layoutChanged(); emit layoutChanged();

2
tqtinterface/qt4/src/widgets/tqtabbar.h
Unescape View File

@ -115,7 +115,7 @@ public:
bool isTabEnabled( int ) const; bool isTabEnabled( int ) const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
int currentTab() const; int currentTab() const;

20
tqtinterface/qt4/src/widgets/tqtabwidget.cpp
Unescape View File

@ -681,10 +681,10 @@ void TQTabWidget::setUpLayout( bool onlyCheck )
TQSize t( 0, d->stack->frameWidth() ); TQSize t( 0, d->stack->frameWidth() );
if ( d->tabs->isVisibleTo(this) ) if ( d->tabs->isVisibleTo(this) )
t = d->tabs->sizeHint(); t = d->tabs->tqsizeHint();
int lcw = 0; int lcw = 0;
if ( d->leftCornerWidget && d->leftCornerWidget->isVisible() ) { if ( d->leftCornerWidget && d->leftCornerWidget->isVisible() ) {
TQSize sz = d->leftCornerWidget->sizeHint(); TQSize sz = d->leftCornerWidget->tqsizeHint();
d->leftCornerWidget->resize(sz); d->leftCornerWidget->resize(sz);
lcw = sz.width(); lcw = sz.width();
if ( t.height() > lcw ) if ( t.height() > lcw )
@ -692,7 +692,7 @@ void TQTabWidget::setUpLayout( bool onlyCheck )
} }
int rcw = 0; int rcw = 0;
if ( d->rightCornerWidget && d->rightCornerWidget->isVisible() ) { if ( d->rightCornerWidget && d->rightCornerWidget->isVisible() ) {
TQSize sz = d->rightCornerWidget->sizeHint(); TQSize sz = d->rightCornerWidget->tqsizeHint();
d->rightCornerWidget->resize(sz); d->rightCornerWidget->resize(sz);
rcw = sz.width(); rcw = sz.width();
if ( t.height() > rcw ) if ( t.height() > rcw )
@ -760,20 +760,20 @@ void TQTabWidget::setUpLayout( bool onlyCheck )
/*! /*!
\reimp \reimp
*/ */
TQSize TQTabWidget::sizeHint() const TQSize TQTabWidget::tqsizeHint() const
{ {
TQSize lc(0, 0), rc(0, 0); TQSize lc(0, 0), rc(0, 0);
if (d->leftCornerWidget) if (d->leftCornerWidget)
lc = d->leftCornerWidget->sizeHint(); lc = d->leftCornerWidget->tqsizeHint();
if(d->rightCornerWidget) if(d->rightCornerWidget)
rc = d->rightCornerWidget->sizeHint(); rc = d->rightCornerWidget->tqsizeHint();
if ( !d->dirty ) { if ( !d->dirty ) {
TQTabWidget *that = (TQTabWidget*)this; TQTabWidget *that = (TQTabWidget*)this;
that->setUpLayout( TRUE ); that->setUpLayout( TRUE );
} }
TQSize s( d->stack->sizeHint() ); TQSize s( d->stack->tqsizeHint() );
TQSize t( d->tabs->sizeHint() ); TQSize t( d->tabs->tqsizeHint() );
if(!tqstyle().tqstyleHint(TQStyle::SH_TabBar_PreferNoArrows, d->tabs)) if(!tqstyle().tqstyleHint(TQStyle::SH_TabBar_PreferNoArrows, d->tabs))
t = t.boundedTo( TQSize(200,200) ); t = t.boundedTo( TQSize(200,200) );
else else
@ -781,7 +781,7 @@ TQSize TQTabWidget::sizeHint() const
TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ), TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ),
s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) ); s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) );
return tqstyle().sizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); return tqstyle().tqsizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut());
} }
@ -807,7 +807,7 @@ TQSize TQTabWidget::tqminimumSizeHint() const
TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ), TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ),
s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) ); s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) );
return tqstyle().sizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); return tqstyle().tqsizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut());
} }
/*! /*!

2
tqtinterface/qt4/src/widgets/tqtabwidget.h
Unescape View File

@ -107,7 +107,7 @@ public:
int currentPageIndex() const; int currentPageIndex() const;
int indexOf( TQWidget * ) const; int indexOf( TQWidget * ) const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
enum TabPosition { Top, Bottom }; enum TabPosition { Top, Bottom };

4
tqtinterface/qt4/src/widgets/tqtextedit.cpp
Unescape View File

@ -5446,9 +5446,9 @@ void TQTextEdit::setTabStopWidth( int ts )
\reimp \reimp
*/ */
TQSize TQTextEdit::sizeHint() const TQSize TQTextEdit::tqsizeHint() const
{ {
// cf. TQScrollView::sizeHint() // cf. TQScrollView::tqsizeHint()
constPolish(); constPolish();
int f = 2 * frameWidth(); int f = 2 * frameWidth();
int h = fontMetrics().height(); int h = fontMetrics().height();

2
tqtinterface/qt4/src/widgets/tqtextedit.h
Unescape View File

@ -269,7 +269,7 @@ public:
TQString anchorAt( const TQPoint& pos ); TQString anchorAt( const TQPoint& pos );
TQString anchorAt( const TQPoint& pos, Qt::AnchorAttribute a ); TQString anchorAt( const TQPoint& pos, Qt::AnchorAttribute a );
TQSize sizeHint() const; TQSize tqsizeHint() const;
bool isReadOnly() const { return readonly; } bool isReadOnly() const { return readonly; }

2
tqtinterface/qt4/src/widgets/tqtitlebar.cpp
Unescape View File

@ -660,7 +660,7 @@ bool TQTitleBar::autoRaise() const
return d->autoraise; return d->autoraise;
} }
TQSize TQTitleBar::sizeHint() const TQSize TQTitleBar::tqsizeHint() const
{ {
constPolish(); constPolish();
TQRect menur = tqstyle().querySubControlMetrics(TQStyle::CC_TitleBar, this, TQRect menur = tqstyle().querySubControlMetrics(TQStyle::CC_TitleBar, this,

2
tqtinterface/qt4/src/widgets/tqtitlebar_p.h
Unescape View File

@ -89,7 +89,7 @@ public:
TQWidget *window() const; TQWidget *window() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
#ifdef TQT_NO_WIDGET_TOPEXTRA #ifdef TQT_NO_WIDGET_TOPEXTRA
// We provide one, since titlebar is useless otherwise. // We provide one, since titlebar is useless otherwise.

10
tqtinterface/qt4/src/widgets/tqtoolbar.cpp
Unescape View File

@ -106,7 +106,7 @@ class TQToolBarSeparator : public TQWidget
public: public:
TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
TQSize sizeHint() const; TQSize tqsizeHint() const;
Qt::Orientation orientation() const { return orient; } Qt::Orientation orientation() const { return orient; }
public Q_SLOTS: public Q_SLOTS:
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );
@ -188,7 +188,7 @@ void TQToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient ); setOrientation( orient );
} }
TQSize TQToolBarSeparator::sizeHint() const TQSize TQToolBarSeparator::tqsizeHint() const
{ {
int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this ); this );
@ -698,7 +698,7 @@ void TQToolBar::createPopup()
cp->setItemChecked( i, TRUE ); cp->setItemChecked( i, TRUE );
if ( !maxItems ) { if ( !maxItems ) {
if ( cp->count() == 10 ) { if ( cp->count() == 10 ) {
int h = cp->sizeHint().height(); int h = cp->tqsizeHint().height();
maxItems = TQApplication::desktop()->height() * 10 / h; maxItems = TQApplication::desktop()->height() * 10 / h;
} }
} else if ( cp->count() >= maxItems - 1 ) { } else if ( cp->count() >= maxItems - 1 ) {
@ -734,9 +734,9 @@ void TQToolBar::checkForExtension( const TQSize &sz )
bool tooSmall; bool tooSmall;
if ( orientation() == Qt::Horizontal ) if ( orientation() == Qt::Horizontal )
tooSmall = sz.width() < sizeHint().width(); tooSmall = sz.width() < tqsizeHint().width();
else else
tooSmall = sz.height() < sizeHint().height(); tooSmall = sz.height() < tqsizeHint().height();
if ( tooSmall ) { if ( tooSmall ) {
createPopup(); createPopup();

2
tqtinterface/qt4/src/widgets/tqtoolbox.cpp
Unescape View File

@ -132,7 +132,7 @@ void TQToolBoxPrivate::updateTabs()
} }
} }
TQSize TQToolBoxButton::sizeHint() const TQSize TQToolBoxButton::tqsizeHint() const
{ {
TQSize iconSize(8, 8); TQSize iconSize(8, 8);
if ( !icon.isNull() ) if ( !icon.isNull() )

2
tqtinterface/qt4/src/widgets/tqtoolbox.h
Unescape View File

@ -145,7 +145,7 @@ public:
inline void setIconSet( const TQIconSet &is ) { icon = is; update(); } inline void setIconSet( const TQIconSet &is ) { icon = is; update(); }
inline TQIconSet iconSet() const { return icon; } inline TQIconSet iconSet() const { return icon; }
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
protected: protected:

24
tqtinterface/qt4/src/widgets/tqtoolbutton.cpp
Unescape View File

@ -309,7 +309,7 @@ void TQToolButton::setToggleButton( bool enable )
/*! /*!
\reimp \reimp
*/ */
TQSize TQToolButton::sizeHint() const TQSize TQToolButton::tqsizeHint() const
{ {
constPolish(); constPolish();
@ -356,7 +356,7 @@ TQSize TQToolButton::sizeHint() const
if ( popup() && ! popupDelay() ) if ( popup() && ! popupDelay() )
w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
#endif #endif
return (tqstyle().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut())); expandedTo(TQApplication::globalStrut()));
} }
@ -365,7 +365,7 @@ TQSize TQToolButton::sizeHint() const
*/ */
TQSize TQToolButton::tqminimumSizeHint() const TQSize TQToolButton::tqminimumSizeHint() const
{ {
return sizeHint(); return tqsizeHint();
} }
/*! /*!
@ -918,32 +918,32 @@ void TQToolButton::popupTimerDone()
TQRect screen = tqApp->desktop()->availableGeometry( this ); TQRect screen = tqApp->desktop()->availableGeometry( this );
if ( horizontal ) { if ( horizontal ) {
if ( TQApplication::reverseLayout() ) { if ( TQApplication::reverseLayout() ) {
if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->sizeHint().height() <= screen.height() ) { if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->tqsizeHint().height() <= screen.height() ) {
p = mapToGlobal( rect().bottomRight() ); p = mapToGlobal( rect().bottomRight() );
} else { } else {
p = mapToGlobal( rect().topRight() - TQPoint( 0, d->popup->sizeHint().height() ) ); p = mapToGlobal( rect().topRight() - TQPoint( 0, d->popup->tqsizeHint().height() ) );
} }
p.rx() -= d->popup->sizeHint().width(); p.rx() -= d->popup->tqsizeHint().width();
} else { } else {
if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->sizeHint().height() <= screen.height() ) { if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->tqsizeHint().height() <= screen.height() ) {
p = mapToGlobal( rect().bottomLeft() ); p = mapToGlobal( rect().bottomLeft() );
} else { } else {
p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->sizeHint().height() ) ); p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->tqsizeHint().height() ) );
} }
} }
} else { } else {
if ( TQApplication::reverseLayout() ) { if ( TQApplication::reverseLayout() ) {
if ( mapToGlobal( TQPoint( rect().left(), 0 ) ).x() - d->popup->sizeHint().width() <= screen.x() ) { if ( mapToGlobal( TQPoint( rect().left(), 0 ) ).x() - d->popup->tqsizeHint().width() <= screen.x() ) {
p = mapToGlobal( rect().topRight() ); p = mapToGlobal( rect().topRight() );
} else { } else {
p = mapToGlobal( rect().topLeft() ); p = mapToGlobal( rect().topLeft() );
p.rx() -= d->popup->sizeHint().width(); p.rx() -= d->popup->tqsizeHint().width();
} }
} else { } else {
if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + d->popup->sizeHint().width() <= screen.width() ) { if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + d->popup->tqsizeHint().width() <= screen.width() ) {
p = mapToGlobal( rect().topRight() ); p = mapToGlobal( rect().topRight() );
} else { } else {
p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->sizeHint().width(), 0 ) ); p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->tqsizeHint().width(), 0 ) );
} }
} }
} }

2
tqtinterface/qt4/src/widgets/tqtoolbutton.h
Unescape View File

@ -92,7 +92,7 @@ public:
TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char* name=0 ); TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char* name=0 );
~TQToolButton(); ~TQToolButton();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
#ifndef TQT_NO_COMPAT #ifndef TQT_NO_COMPAT

2
tqtinterface/qt4/src/widgets/tqvbox.cpp
Unescape View File

@ -52,7 +52,7 @@
\ingroup organizers \ingroup organizers
All its child widgets will be placed vertically and sized All its child widgets will be placed vertically and sized
according to their sizeHint()s. according to their tqsizeHint()s.
\img qvbox-m.png TQVBox \img qvbox-m.png TQVBox

2
tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp
Unescape View File

@ -44,7 +44,7 @@
#include "tqframe.h" #include "tqframe.h"
#include "tqapplication.h" #include "tqapplication.h"
#include "tqcursor.h" #include "tqcursor.h"
#include "sizegrip.h" #include "tqsizegrip.h"
#if defined(TQ_WS_WIN) #if defined(TQ_WS_WIN)
#include "tqt_windows.h" #include "tqt_windows.h"
#endif #endif

24
tqtinterface/qt4/src/widgets/tqwidgetstack.cpp
Unescape View File

@ -492,7 +492,7 @@ void TQWidgetStack::resizeEvent(TQResizeEvent * e)
\reimp \reimp
*/ */
TQSize TQWidgetStack::sizeHint() const TQSize TQWidgetStack::tqsizeHint() const
{ {
constPolish(); constPolish();
@ -503,10 +503,10 @@ TQSize TQWidgetStack::sizeHint() const
while ((w = it.current()) != 0) { while ((w = it.current()) != 0) {
++it; ++it;
TQSize sh = w->sizeHint(); TQSize sh = w->tqsizeHint();
if (w->sizePolicy().horData() == QSizePolicy::Ignored) if (w->tqsizePolicy().horData() == QSizePolicy::Ignored)
sh.rwidth() = 0; sh.rwidth() = 0;
if (w->sizePolicy().verData() == QSizePolicy::Ignored) if (w->tqsizePolicy().verData() == QSizePolicy::Ignored)
sh.rheight() = 0; sh.rheight() = 0;
#ifndef QT_NO_LAYOUT #ifndef QT_NO_LAYOUT
size = size.expandedTo(sh).expandedTo(tqSmartMinSize(w)); size = size.expandedTo(sh).expandedTo(tqSmartMinSize(w));
@ -534,9 +534,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const
while ((w = it.current()) != 0) { while ((w = it.current()) != 0) {
++it; ++it;
TQSize sh = w->tqminimumSizeHint(); TQSize sh = w->tqminimumSizeHint();
if (w->sizePolicy().horData() == QSizePolicy::Ignored) if (w->tqsizePolicy().horData() == QSizePolicy::Ignored)
sh.rwidth() = 0; sh.rwidth() = 0;
if (w->sizePolicy().verData() == QSizePolicy::Ignored) if (w->tqsizePolicy().verData() == QSizePolicy::Ignored)
sh.rheight() = 0; sh.rheight() = 0;
#ifndef QT_NO_LAYOUT #ifndef QT_NO_LAYOUT
size = size.expandedTo(sh).expandedTo(w->minimumSize()); size = size.expandedTo(sh).expandedTo(w->minimumSize());
@ -1114,7 +1114,7 @@ void TQWidgetStack::resizeEvent( TQResizeEvent * e )
\reimp \reimp
*/ */
TQSize TQWidgetStack::sizeHint() const TQSize TQWidgetStack::tqsizeHint() const
{ {
constPolish(); constPolish();
@ -1125,10 +1125,10 @@ TQSize TQWidgetStack::sizeHint() const
while ( (w = it.current()) != 0 ) { while ( (w = it.current()) != 0 ) {
++it; ++it;
TQSize sh = w->sizeHint(); TQSize sh = w->tqsizeHint();
if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
sh.rwidth() = 0; sh.rwidth() = 0;
if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
sh.rheight() = 0; sh.rheight() = 0;
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
size = size.expandedTo( sh ).expandedTo( tqSmartMinSize(w) ); size = size.expandedTo( sh ).expandedTo( tqSmartMinSize(w) );
@ -1156,9 +1156,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const
while ( (w = it.current()) != 0 ) { while ( (w = it.current()) != 0 ) {
++it; ++it;
TQSize sh = w->tqminimumSizeHint(); TQSize sh = w->tqminimumSizeHint();
if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
sh.rwidth() = 0; sh.rwidth() = 0;
if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
sh.rheight() = 0; sh.rheight() = 0;
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
size = size.expandedTo( sh ).expandedTo( w->tqminimumSize() ); size = size.expandedTo( sh ).expandedTo( w->tqminimumSize() );

4
tqtinterface/qt4/src/widgets/tqwidgetstack.h
Unescape View File

@ -71,7 +71,7 @@ public:
int addWidget(TQWidget *, int = -1); int addWidget(TQWidget *, int = -1);
void removeWidget(TQWidget *); void removeWidget(TQWidget *);
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void setVisible(bool visible); void setVisible(bool visible);
@ -186,7 +186,7 @@ public:
int addWidget( TQWidget *, int = -1 ); int addWidget( TQWidget *, int = -1 );
void removeWidget( TQWidget * ); void removeWidget( TQWidget * );
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void show(); void show();

8
tqtinterface/qt4/src/workspace/tqworkspace.cpp
Unescape View File

@ -161,7 +161,7 @@ public:
void doResize(); void doResize();
void doMove(); void doMove();
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
TQSize baseSize() const; TQSize baseSize() const;
@ -393,7 +393,7 @@ TQWorkspace::~TQWorkspace()
} }
/*!\reimp */ /*!\reimp */
TQSize TQWorkspace::sizeHint() const TQSize TQWorkspace::tqsizeHint() const
{ {
TQSize s( TQApplication::desktop()->size() ); TQSize s( TQApplication::desktop()->size() );
return TQSize( s.width()*2/3, s.height()*2/3); return TQSize( s.width()*2/3, s.height()*2/3);
@ -2279,10 +2279,10 @@ TQSize TQWorkspaceChild::baseSize() const
return TQSize( 2*frameWidth(), 2*frameWidth() + th ); return TQSize( 2*frameWidth(), 2*frameWidth() + th );
} }
TQSize TQWorkspaceChild::sizeHint() const TQSize TQWorkspaceChild::tqsizeHint() const
{ {
if ( !childWidget ) if ( !childWidget )
return TQFrame::sizeHint() + baseSize(); return TQFrame::tqsizeHint() + baseSize();
TQSize prefSize = windowWidget()->sizeHint().expandedTo( windowWidget()->minimumSizeHint() ); TQSize prefSize = windowWidget()->sizeHint().expandedTo( windowWidget()->minimumSizeHint() );
prefSize = prefSize.expandedTo( windowWidget()->tqminimumSize() ).boundedTo( windowWidget()->tqmaximumSize() ); prefSize = prefSize.expandedTo( windowWidget()->tqminimumSize() ).boundedTo( windowWidget()->tqmaximumSize() );

2
tqtinterface/qt4/src/workspace/tqworkspace.h
Unescape View File

@ -89,7 +89,7 @@ public:
TQWidgetList windowList() const; // ### merge with below in 4.0 TQWidgetList windowList() const; // ### merge with below in 4.0
TQWidgetList windowList( WindowOrder order ) const; TQWidgetList windowList( WindowOrder order ) const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
bool scrollBarsEnabled() const; bool scrollBarsEnabled() const;
void setScrollBarsEnabled( bool enable ); void setScrollBarsEnabled( bool enable );

2
tqtinterface/qt4/tools/assistant/finddialog.ui
Unescape View File

@ -165,7 +165,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>0</height> <height>0</height>

6
tqtinterface/qt4/tools/assistant/helpdialog.ui
Unescape View File

@ -217,7 +217,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -283,7 +283,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -363,7 +363,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>

6
tqtinterface/qt4/tools/assistant/settingsdialog.ui
Unescape View File

@ -215,7 +215,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -352,7 +352,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>81</height> <height>81</height>
@ -417,7 +417,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/assistant/topicchooser.ui
Unescape View File

@ -106,7 +106,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/about.ui
Unescape View File

@ -136,7 +136,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -167,7 +167,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -198,7 +198,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/actiondnd.cpp
Unescape View File

@ -170,7 +170,7 @@ void TQDesignerToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient ); setOrientation( orient );
} }
TQSize TQDesignerToolBarSeparator::sizeHint() const TQSize TQDesignerToolBarSeparator::tqsizeHint() const
{ {
int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this ); this );

2
tqtinterface/qt4/tools/designer/designer/actiondnd.h
Unescape View File

@ -154,7 +154,7 @@ class TQDesignerToolBarSeparator : public TQWidget
public: public:
TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
TQSize sizeHint() const; TQSize tqsizeHint() const;
Qt::Orientation orientation() const { return orient; } Qt::Orientation orientation() const { return orient; }
public Q_SLOTS: public Q_SLOTS:
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );

2
tqtinterface/qt4/tools/designer/designer/actioneditor.ui
Unescape View File

@ -134,7 +134,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>342</width> <width>342</width>
<height>0</height> <height>0</height>
@ -126,7 +126,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>0</height> <height>0</height>
@ -222,7 +222,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>0</height> <height>0</height>

2
tqtinterface/qt4/tools/designer/designer/connectiondialog.ui
Unescape View File

@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/createtemplate.ui
Unescape View File

@ -138,7 +138,7 @@
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>sizeHint</name> <name>tqsizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -210,7 +210,7 @@
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>sizeHint</name> <name>tqsizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

12
tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui
Unescape View File

@ -134,7 +134,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -167,7 +167,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -534,7 +534,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -607,7 +607,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -821,7 +821,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -907,7 +907,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

12
tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp
Unescape View File

@ -202,8 +202,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
previewPixmap->setPixmap( *w->pixmap ); previewPixmap->setPixmap( *w->pixmap );
else else
previewPixmap->setText( "" ); previewPixmap->setText( "" );
spinWidth->setValue( w->sizeHint.width() ); spinWidth->setValue( w->tqsizeHint.width() );
spinHeight->setValue( w->sizeHint.height() ); spinHeight->setValue( w->tqsizeHint.height() );
sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) ); sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) ); sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
checkContainer->setChecked( w->isContainer ); checkContainer->setChecked( w->isContainer );
@ -313,7 +313,7 @@ void CustomWidgetEditor::heightChanged( int h )
if ( !i || !w ) if ( !i || !w )
return; return;
w->sizeHint.setHeight( h ); w->tqsizeHint.setHeight( h );
updateCustomWidgetSizes(); updateCustomWidgetSizes();
} }
@ -357,7 +357,7 @@ void CustomWidgetEditor::widthChanged( int wid )
if ( !i || !w ) if ( !i || !w )
return; return;
w->sizeHint.setWidth( wid ); w->tqsizeHint.setWidth( wid );
updateCustomWidgetSizes(); updateCustomWidgetSizes();
} }
@ -713,8 +713,8 @@ void CustomWidgetEditor::saveDescription()
<< "\">" << w->includeFile << "</header>" << endl; << "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent2( indent ) << "<sizehint>" << endl; ts << makeIndent2( indent ) << "<sizehint>" << endl;
indent++; indent++;
ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
indent--; indent--;
ts << makeIndent2( indent ) << "</sizehint>" << endl; ts << makeIndent2( indent ) << "</sizehint>" << endl;
ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;

4
tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui
Unescape View File

@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -120,7 +120,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

12
tqtinterface/qt4/tools/designer/designer/dbconnections.ui
Unescape View File

@ -116,7 +116,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -149,7 +149,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -183,7 +183,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -216,7 +216,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -244,7 +244,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -263,7 +263,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/defs.h
Unescape View File

@ -34,7 +34,7 @@
#ifndef DEFS_H #ifndef DEFS_H
#define DEFS_H #define DEFS_H
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <tqstring.h> #include <tqstring.h>
#define POINTER_TOOL 32000 #define POINTER_TOOL 32000

8
tqtinterface/qt4/tools/designer/designer/editfunctions.ui
Unescape View File

@ -196,7 +196,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -361,7 +361,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -525,7 +525,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -573,7 +573,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/finddialog.ui
Unescape View File

@ -124,7 +124,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/formwindow.cpp
Unescape View File

@ -65,7 +65,7 @@
#include <tqpalette.h> #include <tqpalette.h>
#include <tqmessagebox.h> #include <tqmessagebox.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <sizegrip.h> #include <tqsizegrip.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqmetaobject.h> #include <tqmetaobject.h>
@ -414,8 +414,8 @@ void FormWindow::insertWidget()
r.setHeight( 20 ); r.setHeight( 20 );
} }
} else { } else {
r.setWidth( w->sizeHint().width() ); r.setWidth( w->tqsizeHint().width() );
r.setHeight( w->sizeHint().height() ); r.setHeight( w->tqsizeHint().height() );
} }
} }

4
tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui
Unescape View File

@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -146,7 +146,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui
Unescape View File

@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -316,7 +316,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

8
tqtinterface/qt4/tools/designer/designer/layout.cpp
Unescape View File

@ -950,8 +950,8 @@ void Spacer::setSizeType( SizeType t )
Spacer::SizeType Spacer::sizeType() const Spacer::SizeType Spacer::sizeType() const
{ {
if ( orient == Qt::Vertical ) if ( orient == Qt::Vertical )
return (SizeType)sizePolicy().verData(); return (SizeType)tqsizePolicy().verData();
return (SizeType)sizePolicy().horData(); return (SizeType)tqsizePolicy().horData();
} }
int Spacer::tqalignment() const int Spacer::tqalignment() const
@ -972,7 +972,7 @@ TQSize Spacer::tqminimumSize() const
return s; return s;
} }
TQSize Spacer::sizeHint() const TQSize Spacer::tqsizeHint() const
{ {
return sh; return sh;
} }
@ -982,7 +982,7 @@ void Spacer::setSizeHint( const TQSize &s )
{ {
sh = s; sh = s;
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
resize( sizeHint() ); resize( tqsizeHint() );
updateGeometry(); updateGeometry();
} }

4
tqtinterface/qt4/tools/designer/designer/layout.h
Unescape View File

@ -132,7 +132,7 @@ class Spacer : public TQWidget
Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
TQ_ENUMS( SizeType ) TQ_ENUMS( SizeType )
Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) Q_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
private: private:
@ -150,7 +150,7 @@ public:
Spacer( TQWidget *tqparent, const char *name ); Spacer( TQWidget *tqparent, const char *name );
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
void setSizeType( SizeType t ); void setSizeType( SizeType t );
SizeType sizeType() const; SizeType sizeType() const;
int tqalignment() const; int tqalignment() const;

4
tqtinterface/qt4/tools/designer/designer/listboxeditor.ui
Unescape View File

@ -98,7 +98,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -310,7 +310,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/listeditor.ui
Unescape View File

@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/listvieweditor.ui
Unescape View File

@ -299,7 +299,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -604,7 +604,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -649,7 +649,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

10
tqtinterface/qt4/tools/designer/designer/mainwindow.cpp
Unescape View File

@ -115,7 +115,7 @@
#include <tqsettings.h> #include <tqsettings.h>
#include <tqaccel.h> #include <tqaccel.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <sizegrip.h> #include <tqsizegrip.h>
#include <tqtextview.h> #include <tqtextview.h>
#include <tqassistantclient.h> #include <tqassistantclient.h>
#include <stdlib.h> #include <stdlib.h>
@ -2216,8 +2216,8 @@ void MainWindow::writeConfig()
l << w->className; l << w->className;
l << w->includeFile; l << w->includeFile;
l << TQString::number( (int)w->includePolicy ); l << TQString::number( (int)w->includePolicy );
l << TQString::number( w->sizeHint.width() ); l << TQString::number( w->tqsizeHint.width() );
l << TQString::number( w->sizeHint.height() ); l << TQString::number( w->tqsizeHint.height() );
l << TQString::number( w->lstSignals.count() ); l << TQString::number( w->lstSignals.count() );
for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
l << TQString( fixArgs( *it ) ); l << TQString( fixArgs( *it ) );
@ -2356,8 +2356,8 @@ void MainWindow::readConfig()
w->className = l[ 0 ]; w->className = l[ 0 ];
w->includeFile = l[ 1 ]; w->includeFile = l[ 1 ];
w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt(); w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
w->sizeHint.setWidth( l[ 3 ].toInt() ); w->tqsizeHint.setWidth( l[ 3 ].toInt() );
w->sizeHint.setHeight( l[ 4 ].toInt() ); w->tqsizeHint.setHeight( l[ 4 ].toInt() );
uint c = 5; uint c = 5;
if ( l.count() > c ) { if ( l.count() > c ) {
int numSignals = l[ c ].toInt(); int numSignals = l[ c ].toInt();

4
tqtinterface/qt4/tools/designer/designer/menubareditor.cpp
Unescape View File

@ -507,7 +507,7 @@ void MenuBarEditor::deleteItem( int index )
} }
} }
TQSize MenuBarEditor::sizeHint() const TQSize MenuBarEditor::tqsizeHint() const
{ {
return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
} }
@ -581,7 +581,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
lineEdit->hide(); lineEdit->hide();
update(); update();
} else if ( e->type() == TQEvent::LayoutHint ) { } else if ( e->type() == TQEvent::LayoutHint ) {
resize( sizeHint() ); resize( tqsizeHint() );
} }
return TQMenuBar::eventFilter( o, e ); return TQMenuBar::eventFilter( o, e );
} }

6
tqtinterface/qt4/tools/designer/designer/menubareditor.h
Unescape View File

@ -127,9 +127,9 @@ public:
void focusItem( int index = -1 ); void focusItem( int index = -1 );
void deleteItem( int index = -1 ); void deleteItem( int index = -1 );
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSize() const { return sizeHint(); } TQSize tqminimumSize() const { return tqsizeHint(); }
TQSize tqminimumSizeHint() const { return sizeHint(); } TQSize tqminimumSizeHint() const { return tqsizeHint(); }
int heightForWidth( int max_width ) const; int heightForWidth( int max_width ) const;
void show(); void show();

6
tqtinterface/qt4/tools/designer/designer/metadatabase.cpp
Unescape View File

@ -1278,7 +1278,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget"; className = "MyCustomWidget";
includeFile = "mywidget.h"; includeFile = "mywidget.h";
includePolicy = Local; includePolicy = Local;
sizeHint = TQSize( -1, -1 ); tqsizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( TQPixmap::fromMimeSource( "designer_customwidget.png" ) ); pixmap = new TQPixmap( TQPixmap::fromMimeSource( "designer_customwidget.png" ) );
id = -1; id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@ -1290,7 +1290,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className; className = w.className;
includeFile = w.includeFile; includeFile = w.includeFile;
includePolicy = w.includePolicy; includePolicy = w.includePolicy;
sizeHint = w.sizeHint; tqsizeHint = w.tqsizeHint;
if ( w.pixmap ) if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap ); pixmap = new TQPixmap( *w.pixmap );
else else
@ -1341,7 +1341,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className; className = w.className;
includeFile = w.includeFile; includeFile = w.includeFile;
includePolicy = w.includePolicy; includePolicy = w.includePolicy;
sizeHint = w.sizeHint; tqsizeHint = w.tqsizeHint;
if ( w.pixmap ) if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap ); pixmap = new TQPixmap( *w.pixmap );
else else

4
tqtinterface/qt4/tools/designer/designer/metadatabase.h
Unescape View File

@ -39,7 +39,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqmap.h> #include <tqmap.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <tqsize.h> #include <tqsize.h>
#include <tqwidgetlist.h> #include <tqwidgetlist.h>
#include <tqcursor.h> #include <tqcursor.h>
@ -109,7 +109,7 @@ public:
TQString className; TQString className;
TQString includeFile; TQString includeFile;
IncludePolicy includePolicy; IncludePolicy includePolicy;
TQSize sizeHint; TQSize tqsizeHint;
TQSizePolicy sizePolicy; TQSizePolicy sizePolicy;
TQPixmap *pixmap; TQPixmap *pixmap;
TQValueList<TQCString> lstSignals; TQValueList<TQCString> lstSignals;

2
tqtinterface/qt4/tools/designer/designer/multilineeditor.ui
Unescape View File

@ -131,7 +131,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/newform.ui
Unescape View File

@ -98,7 +98,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/paletteeditor.ui
Unescape View File

@ -215,7 +215,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -350,7 +350,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui
Unescape View File

@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -480,7 +480,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -572,7 +572,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui
Unescape View File

@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui
Unescape View File

@ -824,7 +824,7 @@
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>sizeHint</name> <name>tqsizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -875,7 +875,7 @@
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property> <property>
<name>sizeHint</name> <name>tqsizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/preferences.ui
Unescape View File

@ -166,7 +166,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -541,7 +541,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/previewwidget.ui
Unescape View File

@ -295,7 +295,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/projectsettings.ui
Unescape View File

@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>71</height> <height>71</height>
@ -213,7 +213,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
Unescape View File

@ -71,7 +71,7 @@
#include <tqcolordialog.h> #include <tqcolordialog.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <tqbitmap.h> #include <tqbitmap.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -411,7 +411,7 @@ void PropertyItem::createResetButton()
resetButton = new TQPushButton( hbox ); resetButton = new TQPushButton( hbox );
setupStyle( resetButton ); setupStyle( resetButton );
resetButton->setPixmap( TQPixmap::fromMimeSource( "designer_resetproperty.png" ) ); resetButton->setPixmap( TQPixmap::fromMimeSource( "designer_resetproperty.png" ) );
resetButton->setFixedWidth( resetButton->sizeHint().width() ); resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
hbox->tqlayout()->tqsetAlignment( TQt::AlignRight ); hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
listview->addChild( hbox ); listview->addChild( hbox );
hbox->hide(); hbox->hide();
@ -453,7 +453,7 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() ); r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() ); w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() ); listview->moveChild( w, r.x(), r.y() );
resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() ); resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() ); listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) ); resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
} }

6
tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp
Unescape View File

@ -33,7 +33,7 @@
#include "qcompletionedit.h" #include "qcompletionedit.h"
#include <tqlistbox.h> #include <tqlistbox.h>
#include <sizegrip.h> #include <tqsizegrip.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqvbox.h> #include <tqvbox.h>
@ -95,8 +95,8 @@ void TQCompletionEdit::placeListBox()
return; return;
} }
popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) ); TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() ) if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )

2
tqtinterface/qt4/tools/designer/designer/replacedialog.ui
Unescape View File

@ -151,7 +151,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

14
tqtinterface/qt4/tools/designer/designer/resource.cpp
Unescape View File

@ -629,7 +629,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
expandedTo( formwindow->tqminimumSizeHint() ) ) ); expandedTo( formwindow->tqminimumSizeHint() ) ) );
else else
formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
} }
return TRUE; return TRUE;
@ -1424,8 +1424,8 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t
changed = MetaDataBase::changedProperties( w ); changed = MetaDataBase::changedProperties( w );
if ( w->isWidgetType() ) { if ( w->isWidgetType() ) {
if ( ::tqqt_cast<Spacer*>(w) ) { if ( ::tqqt_cast<Spacer*>(w) ) {
if ( !changed.tqcontains( "sizeHint" ) ) if ( !changed.tqcontains( "tqsizeHint" ) )
changed << "sizeHint"; changed << "tqsizeHint";
if ( !changed.tqcontains( "geometry" ) ) if ( !changed.tqcontains( "geometry" ) )
changed << "geometry"; changed << "geometry";
} else { } else {
@ -2630,8 +2630,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
<< "\">" << w->includeFile << "</header>" << endl; << "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++; indent++;
ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
indent--; indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@ -2687,9 +2687,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
TQDomElement n3 = n2.firstChild().toElement(); TQDomElement n3 = n2.firstChild().toElement();
while ( !n3.isNull() ) { while ( !n3.isNull() ) {
if ( n3.tagName() == "width" ) if ( n3.tagName() == "width" )
w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
else if ( n3.tagName() == "height" ) else if ( n3.tagName() == "height" )
w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
n3 = n3.nextSibling().toElement(); n3 = n3.nextSibling().toElement();
} }
} else if ( n2.tagName() == "sizepolicy" ) { } else if ( n2.tagName() == "sizepolicy" ) {

6
tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui
Unescape View File

@ -116,7 +116,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -234,7 +234,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -279,7 +279,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

16
tqtinterface/qt4/tools/designer/designer/sizehandle.cpp
Unescape View File

@ -64,28 +64,28 @@ void SizeHandle::updateCursor()
switch ( dir ) { switch ( dir ) {
case LeftTop: case LeftTop:
setCursor( sizeFDiagCursor ); setCursor( tqsizeFDiagCursor );
break; break;
case Top: case Top:
setCursor( sizeVerCursor ); setCursor( tqsizeVerCursor );
break; break;
case RightTop: case RightTop:
setCursor( sizeBDiagCursor ); setCursor( tqsizeBDiagCursor );
break; break;
case Right: case Right:
setCursor( sizeHorCursor ); setCursor( tqsizeHorCursor );
break; break;
case RightBottom: case RightBottom:
setCursor( sizeFDiagCursor ); setCursor( tqsizeFDiagCursor );
break; break;
case Bottom: case Bottom:
setCursor( sizeVerCursor ); setCursor( tqsizeVerCursor );
break; break;
case LeftBottom: case LeftBottom:
setCursor( sizeBDiagCursor ); setCursor( tqsizeBDiagCursor );
break; break;
case Left: case Left:
setCursor( sizeHorCursor ); setCursor( tqsizeHorCursor );
break; break;
} }
} }

2
tqtinterface/qt4/tools/designer/designer/startdialog.ui
Unescape View File

@ -223,7 +223,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/designer/styledbutton.cpp
Unescape View File

@ -124,7 +124,7 @@ void StyledButton::setScale( bool on )
scalePixmap(); scalePixmap();
} }
TQSize StyledButton::sizeHint() const TQSize StyledButton::tqsizeHint() const
{ {
return TQSize( 50, 25 ); return TQSize( 50, 25 );
} }

2
tqtinterface/qt4/tools/designer/designer/styledbutton.h
Unescape View File

@ -72,7 +72,7 @@ public:
void setScale( bool ); void setScale( bool );
bool scale() const; bool scale() const;
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void setFormWindow( FormWindow *fw ) { formWindow = fw; } void setFormWindow( FormWindow *fw ) { formWindow = fw; }

10
tqtinterface/qt4/tools/designer/designer/tableeditor.ui
Unescape View File

@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -194,7 +194,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -216,7 +216,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -447,7 +447,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -503,7 +503,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/designer/variabledialog.ui
Unescape View File

@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>21</height> <height>21</height>
@ -221,7 +221,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>21</height> <height>21</height>

28
tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp
Unescape View File

@ -94,7 +94,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqtoolbox.h> #include <tqtoolbox.h>
#include <sizegrip.h> #include <tqsizegrip.h>
#ifndef TQT_NO_SQL #ifndef TQT_NO_SQL
#include "database.h" #include "database.h"
#endif #endif
@ -1621,7 +1621,7 @@ bool TQLayoutWidget::event( TQEvent *e )
void TQLayoutWidget::updateSizePolicy() void TQLayoutWidget::updateSizePolicy()
{ {
if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) { if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
sp = TQWidget::sizePolicy(); sp = TQWidget::tqsizePolicy();
return; return;
} }
@ -1666,13 +1666,13 @@ void TQLayoutWidget::updateSizePolicy()
continue; continue;
TQWidget *w = (TQWidget*)o; TQWidget *w = (TQWidget*)o;
if ( !w->sizePolicy().mayGrowHorizontally() ) if ( !w->tqsizePolicy().mayGrowHorizontally() )
ht &= ~TQSizePolicy::Minimum; ht &= ~TQSizePolicy::Minimum;
if ( !w->sizePolicy().mayShrinkHorizontally() ) if ( !w->tqsizePolicy().mayShrinkHorizontally() )
ht &= ~TQSizePolicy::Maximum; ht &= ~TQSizePolicy::Maximum;
if ( w->sizePolicy().mayGrowVertically() ) if ( w->tqsizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum; vt |= TQSizePolicy::Minimum;
if ( w->sizePolicy().mayShrinkVertically() ) if ( w->tqsizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum; vt |= TQSizePolicy::Maximum;
} }
} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) { } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
@ -1687,13 +1687,13 @@ void TQLayoutWidget::updateSizePolicy()
continue; continue;
TQWidget *w = (TQWidget*)o; TQWidget *w = (TQWidget*)o;
if ( w->sizePolicy().mayGrowHorizontally() ) if ( w->tqsizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum; ht |= TQSizePolicy::Minimum;
if ( w->sizePolicy().mayShrinkHorizontally() ) if ( w->tqsizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum; ht |= TQSizePolicy::Maximum;
if ( !w->sizePolicy().mayGrowVertically() ) if ( !w->tqsizePolicy().mayGrowVertically() )
vt &= ~TQSizePolicy::Minimum; vt &= ~TQSizePolicy::Minimum;
if ( !w->sizePolicy().mayShrinkVertically() ) if ( !w->tqsizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum; vt &= ~TQSizePolicy::Maximum;
} }
} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) { } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
@ -1712,13 +1712,13 @@ void TQLayoutWidget::updateSizePolicy()
continue; continue;
TQWidget *w = (TQWidget*)o; TQWidget *w = (TQWidget*)o;
if ( w->sizePolicy().mayGrowHorizontally() ) if ( w->tqsizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum; ht |= TQSizePolicy::Minimum;
if ( w->sizePolicy().mayShrinkHorizontally() ) if ( w->tqsizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum; ht |= TQSizePolicy::Maximum;
if ( w->sizePolicy().mayGrowVertically() ) if ( w->tqsizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum; vt |= TQSizePolicy::Minimum;
if ( w->sizePolicy().mayShrinkVertically() ) if ( w->tqsizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum; vt |= TQSizePolicy::Maximum;
} }
} }

8
tqtinterface/qt4/tools/designer/designer/widgetfactory.h
Unescape View File

@ -249,7 +249,7 @@ class TQLayoutWidget : public TQWidget
TQ_OBJECT TQ_OBJECT
public: public:
TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::sizePolicy() ) {} TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {}
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
void updateSizePolicy(); void updateSizePolicy();
@ -276,11 +276,11 @@ public:
setBackgroundMode( TQt::PaletteDark ); setBackgroundMode( TQt::PaletteDark );
} }
TQSize sizeHint() const { TQSize tqsizeHint() const {
TQSize sh = cusw->sizeHint; TQSize sh = cusw->tqsizeHint;
if ( sh.isValid() ) if ( sh.isValid() )
return sh; return sh;
return TQWidget::sizeHint(); return TQWidget::tqsizeHint();
} }
TQString realClassName() { return cusw->className; } TQString realClassName() { return cusw->className; }

4
tqtinterface/qt4/tools/designer/designer/wizardeditor.ui
Unescape View File

@ -140,7 +140,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -208,7 +208,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/editor/completion.cpp
Unescape View File

@ -41,7 +41,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqregexp.h> #include <tqregexp.h>
#include "arghintwidget.h" #include "arghintwidget.h"
#include <sizegrip.h> #include <tqsizegrip.h>
#include <tqtimer.h> #include <tqtimer.h>
static TQColor getColor( const TQString &type ) static TQColor getColor( const TQString &type )
@ -299,7 +299,7 @@ bool EditorCompletion::doCompletion()
(void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix, (void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix,
(*it).prefix, (*it).postfix2 ); (*it).prefix, (*it).postfix2 );
cList = lst; cList = lst;
completionPopup->resize( completionListBox->sizeHint() + completionPopup->resize( completionListBox->tqsizeHint() +
TQSize( completionListBox->verticalScrollBar()->width() + 4, TQSize( completionListBox->verticalScrollBar()->width() + 4,
completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->horizontalScrollBar()->height() + 4 ) );
completionListBox->setCurrentItem( 0 ); completionListBox->setCurrentItem( 0 );
@ -698,7 +698,7 @@ void EditorCompletion::showCompletion( const TQValueList<CompletionEntry> &lst )
(void)new CompletionItem( completionListBox, (*it).text, (*it).type, (void)new CompletionItem( completionListBox, (*it).text, (*it).type,
(*it).postfix, (*it).prefix, (*it).postfix2 ); (*it).postfix, (*it).prefix, (*it).postfix2 );
cList = lst; cList = lst;
completionPopup->resize( completionListBox->sizeHint() + completionPopup->resize( completionListBox->tqsizeHint() +
TQSize( completionListBox->verticalScrollBar()->width() + 4, TQSize( completionListBox->verticalScrollBar()->width() + 4,
completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->horizontalScrollBar()->height() + 4 ) );
completionListBox->setCurrentItem( 0 ); completionListBox->setCurrentItem( 0 );

2
tqtinterface/qt4/tools/designer/editor/preferences.ui
Unescape View File

@ -270,7 +270,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

4
tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui
Unescape View File

@ -142,7 +142,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -173,7 +173,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/examples/addressbook/search.ui
Unescape View File

@ -78,7 +78,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui
Unescape View File

@ -83,7 +83,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>11</height> <height>11</height>

4
tqtinterface/qt4/tools/designer/examples/colortool/findform.ui
Unescape View File

@ -55,7 +55,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -80,7 +80,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>9</height> <height>9</height>

2
tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui
Unescape View File

@ -101,7 +101,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>10</height> <height>10</height>

6
tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui
Unescape View File

@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -146,7 +146,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -171,7 +171,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/designer/examples/metric/metric.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -224,7 +224,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -268,7 +268,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui
Unescape View File

@ -92,7 +92,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui
Unescape View File

@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui
Unescape View File

@ -80,7 +80,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -249,7 +249,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

8
tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp
Unescape View File

@ -555,15 +555,15 @@ bool Dlg2Ui::isWidgetType( const TQDomElement& e )
void Dlg2Ui::emitSpacer( int spacing, int stretch ) void Dlg2Ui::emitSpacer( int spacing, int stretch )
{ {
TQString orientationStr; TQString orientationStr;
TQSize sizeHint; TQSize tqsizeHint;
TQString sizeType = TQString( "Fixed" ); TQString sizeType = TQString( "Fixed" );
if ( yyBoxKind == TQString("hbox") ) { if ( yyBoxKind == TQString("hbox") ) {
orientationStr = TQString( "Horizontal" ); orientationStr = TQString( "Horizontal" );
sizeHint = TQSize( spacing, 20 ); tqsizeHint = TQSize( spacing, 20 );
} else { } else {
orientationStr = TQString( "Vertical" ); orientationStr = TQString( "Vertical" );
sizeHint = TQSize( 20, spacing ); tqsizeHint = TQSize( 20, spacing );
} }
if ( stretch > 0 ) if ( stretch > 0 )
sizeType = TQString( "Expanding" ); sizeType = TQString( "Expanding" );
@ -573,7 +573,7 @@ void Dlg2Ui::emitSpacer( int spacing, int stretch )
TQString("Spacer%1").arg(uniqueSpacer++).latin1() ); TQString("Spacer%1").arg(uniqueSpacer++).latin1() );
emitProperty( TQString("orientation"), orientationStr, TQString("enum") ); emitProperty( TQString("orientation"), orientationStr, TQString("enum") );
if ( spacing > 0 ) if ( spacing > 0 )
emitProperty( TQString("sizeHint"), sizeHint, TQString("qsize") ); emitProperty( TQString("tqsizeHint"), tqsizeHint, TQString("qsize") );
emitProperty( TQString("sizeType"), sizeType, TQString("enum") ); emitProperty( TQString("sizeType"), sizeType, TQString("enum") );
emitClosing( TQString("spacer") ); emitClosing( TQString("spacer") );
} }

2
tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
Unescape View File

@ -43,7 +43,7 @@
#include <tqmessagebox.h> #include <tqmessagebox.h>
#include <tqrect.h> #include <tqrect.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <ctype.h> #include <ctype.h>

18
tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui
Unescape View File

@ -91,7 +91,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -166,7 +166,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -243,7 +243,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -344,7 +344,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -528,7 +528,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -545,7 +545,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -562,7 +562,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -625,7 +625,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -642,7 +642,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

36
tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui
Unescape View File

@ -153,7 +153,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -253,7 +253,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -304,7 +304,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -338,7 +338,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -665,7 +665,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -722,7 +722,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -930,7 +930,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -974,7 +974,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1074,7 +1074,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1125,7 +1125,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1176,7 +1176,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1282,7 +1282,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1365,7 +1365,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1382,7 +1382,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -1488,7 +1488,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1551,7 +1551,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1568,7 +1568,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1585,7 +1585,7 @@ name like "qt%"
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/shared/domtool.cpp
Unescape View File

@ -33,7 +33,7 @@
#include "domtool.h" #include "domtool.h"
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <tqcolor.h> #include <tqcolor.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <tqdatetime.h> #include <tqdatetime.h>

2
tqtinterface/qt4/tools/designer/shared/ui2uib.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <tqfont.h> #include <tqfont.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqrect.h> #include <tqrect.h>
#include <sizepolicy.h> #include <tqsizepolicy.h>
/* /*
The .uib file format is the binary counterpart of the .ui file The .uib file format is the binary counterpart of the .ui file

2
tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui
Unescape View File

@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui
Unescape View File

@ -64,7 +64,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui
Unescape View File

@ -95,7 +95,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui
Unescape View File

@ -87,7 +87,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/designer/tools/createcw/main.cpp
Unescape View File

@ -97,8 +97,8 @@ static void createDescription( const TQValueList<Widget> &l, TQTextStream &ts )
ts << makeIndent( indent ) << "<header location=\"" << w.location << "\">" << w.include << "</header>" << endl; ts << makeIndent( indent ) << "<header location=\"" << w.location << "\">" << w.include << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++; indent++;
ts << makeIndent( indent ) << "<width>" << w.w->sizeHint().width() << "</width>" << endl; ts << makeIndent( indent ) << "<width>" << w.w->tqsizeHint().width() << "</width>" << endl;
ts << makeIndent( indent ) << "<height>" << w.w->sizeHint().height() << "</height>" << endl; ts << makeIndent( indent ) << "<height>" << w.w->tqsizeHint().height() << "</height>" << endl;
indent--; indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << ( w.w->inherits( "TQGroupBox" ) || w.w->inherits( "TQWidgetStack" ) ) << "</container>" << endl; ts << makeIndent( indent ) << "<container>" << ( w.w->inherits( "TQGroupBox" ) || w.w->inherits( "TQWidgetStack" ) ) << "</container>" << endl;

2
tqtinterface/qt4/tools/designer/uic/object.cpp
Unescape View File

@ -35,7 +35,7 @@
#include "parser.h" #include "parser.h"
#include "domtool.h" #include "domtool.h"
#include <tqregexp.h> #include <tqregexp.h>
#include <sizepolicy.h> #include <tqsizepolicy.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#define NO_STATIC_COLORS #define NO_STATIC_COLORS
#include <globaldefs.h> #include <globaldefs.h>

2
tqtinterface/qt4/tools/designer/uic/uic.cpp
Unescape View File

@ -909,7 +909,7 @@ TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentC
objClass = e.tagName(); objClass = e.tagName();
objName = registerObject( getObjectName( e ) ); objName = registerObject( getObjectName( e ) );
TQSize size = DomTool::readProperty( e, "sizeHint", TQSize( 0, 0 ) ).toSize(); TQSize size = DomTool::readProperty( e, "tqsizeHint", TQSize( 0, 0 ) ).toSize();
TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString();
bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical";

4
tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp
Unescape View File

@ -693,7 +693,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
if ( name == "orientation" ) { if ( name == "orientation" ) {
vertical = ( value == "Vertical" ); vertical = ( value == "Vertical" );
} else if ( name == "sizeHint" ) { } else if ( name == "tqsizeHint" ) {
w = value.toSize().width(); w = value.toSize().width();
h = value.toSize().height(); h = value.toSize().height();
} else if ( name == "sizeType" ) { } else if ( name == "sizeType" ) {
@ -1949,7 +1949,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
orient = Qt::Vertical; orient = Qt::Vertical;
} else if ( prop == "sizeType" ) { } else if ( prop == "sizeType" ) {
sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
} else if ( prop == "sizeHint" ) { } else if ( prop == "tqsizeHint" ) {
w = n.firstChild().firstChild().firstChild().toText().data().toInt(); w = n.firstChild().firstChild().firstChild().toText().data().toInt();
h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt(); h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
} }

6
tqtinterface/qt4/tools/linguist/linguist/about.ui
Unescape View File

@ -133,7 +133,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -164,7 +164,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -195,7 +195,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp
Unescape View File

@ -165,7 +165,7 @@ PhraseLV::~PhraseLV()
// delete what; // delete what;
} }
TQSize PhraseLV::sizeHint() const TQSize PhraseLV::tqsizeHint() const
{ {
return TQSize( TQListView::sizeHint().width(), 50 ); return TQSize( TQListView::tqsizeHint().width(), 50 );
} }

2
tqtinterface/qt4/tools/linguist/linguist/phraselv.h
Unescape View File

@ -74,7 +74,7 @@ public:
PhraseLV( TQWidget *tqparent, const char *name ); PhraseLV( TQWidget *tqparent, const char *name );
~PhraseLV(); ~PhraseLV();
virtual TQSize sizeHint() const; virtual TQSize tqsizeHint() const;
private: private:
TQWhatsThis *what; TQWhatsThis *what;

4
tqtinterface/qt4/tools/linguist/linguist/statistics.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -94,7 +94,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h
Unescape View File

@ -33,7 +33,7 @@
void Statistics::init() void Statistics::init()
{ {
setFixedHeight( sizeHint().height() ); setFixedHeight( tqsizeHint().height() );
} }
void Statistics::updateStats( int w1, int c1, int cs1, int w2, int c2, int cs2 ) void Statistics::updateStats( int w1, int c1, int cs1, int w2, int c2, int cs2 )

4
tqtinterface/qt4/tools/qconfig/main.cpp
Unescape View File

@ -533,7 +533,7 @@ void Main::loadFeatures(const TQString& filename)
} }
#ifdef FIXED_LAYOUT #ifdef FIXED_LAYOUT
lv->setFixedWidth(lv->sizeHint().width()); lv->setFixedWidth(lv->tqsizeHint().width());
#endif #endif
} }
@ -727,7 +727,7 @@ int main(int argc, char** argv)
} }
m.loadFeatures(qfeatures); m.loadFeatures(qfeatures);
m.loadConfig(qconfig); m.loadConfig(qconfig);
m.resize(m.sizeHint()+TQSize(500,300)); m.resize(m.tqsizeHint()+TQSize(500,300));
app.setMainWidget(&m); app.setMainWidget(&m);
m.show(); m.show();
return app.exec(); return app.exec();

2
tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
Unescape View File

@ -76,7 +76,7 @@ void ColorButton::changeColor()
} }
TQSize ColorButton::sizeHint() const TQSize ColorButton::tqsizeHint() const
{ {
return TQSize(40, 25); return TQSize(40, 25);
} }

2
tqtinterface/qt4/tools/qtconfig/colorbutton.h
Unescape View File

@ -49,7 +49,7 @@ public:
const TQColor &color() const { return col; } const TQColor &color() const { return col; }
void setColor(const TQColor &); void setColor(const TQColor &);
TQSize sizeHint() const; TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
void mousePressEvent(TQMouseEvent *); void mousePressEvent(TQMouseEvent *);

8
tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui
Unescape View File

@ -227,7 +227,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>
@ -1039,7 +1039,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -1157,7 +1157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1321,7 +1321,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui
Unescape View File

@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -437,7 +437,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -515,7 +515,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui
Unescape View File

@ -295,7 +295,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

10
tqtinterface/qt4/tools/qvfb/config.ui
Unescape View File

@ -191,7 +191,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -540,7 +540,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1397,7 +1397,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1414,7 +1414,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1444,7 +1444,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
tqtinterface/qt4/tools/qvfb/qvfb.cpp
Unescape View File

@ -114,7 +114,7 @@ void TQVFb::init( int display_id, int w, int h, int d, const TQString &skin_name
view->setMargin( 0 ); view->setMargin( 0 );
view->setFrameStyle( TQFrame::NoFrame ); view->setFrameStyle( TQFrame::NoFrame );
setCentralWidget( view ); setCentralWidget( view );
resize( sizeHint() ); resize( tqsizeHint() );
view->show(); view->show();
} }

2
tqtinterface/qt4/tools/qvfb/qvfbview.cpp
Unescape View File

@ -165,7 +165,7 @@ TQVFbView::~TQVFbView()
unlink( keyboardPipe ); unlink( keyboardPipe );
} }
TQSize TQVFbView::sizeHint() const TQSize TQVFbView::tqsizeHint() const
{ {
int f = 2 * frameWidth(); int f = 2 * frameWidth();
return TQSize( contentsWidth() + f, contentsHeight() + f ); return TQSize( contentsWidth() + f, contentsHeight() + f );

2
tqtinterface/qt4/tools/qvfb/qvfbview.h
Unescape View File

@ -67,7 +67,7 @@ public:
double zoom() const { return zm; } double zoom() const { return zm; }
TQSize sizeHint() const; TQSize tqsizeHint() const;
public Q_SLOTS: public Q_SLOTS:
void setTouchscreenEmulation( bool ); void setTouchscreenEmulation( bool );

Write Preview
Loading…
Cancel
Save