diff options
Diffstat (limited to 'experimental')
227 files changed, 849 insertions, 849 deletions
diff --git a/experimental/tqtinterface/qt4/include/tqtglobaldefines.h~ b/experimental/tqtinterface/qt4/include/tqtglobaldefines.h~ index 04b86e3a5..6c023a839 100644 --- a/experimental/tqtinterface/qt4/include/tqtglobaldefines.h~ +++ b/experimental/tqtinterface/qt4/include/tqtglobaldefines.h~ @@ -193,11 +193,11 @@ // #define tqcrossCursor Qt::CrossCursor // #define tqwaitCursor Qt::WaitCursor // #define tqibeamCursor Qt::IBeamCursor -// #define sizeVerCursor Qt::SizeVerCursor -// #define sizeHorCursor Qt::SizeHorCursor -// #define sizeBDiagCursor Qt::SizeBDiagCursor -// #define sizeFDiagCursor Qt::SizeFDiagCursor -// #define sizeAllCursor Qt::SizeAllCursor +// #define tqsizeVerCursor Qt::SizeVerCursor +// #define tqsizeHorCursor Qt::SizeHorCursor +// #define tqsizeBDiagCursor Qt::SizeBDiagCursor +// #define tqsizeFDiagCursor Qt::SizeFDiagCursor +// #define tqsizeAllCursor Qt::SizeAllCursor // #define tqblankCursor Qt::BlankCursor // #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitHCursor Qt::SplitHCursor @@ -211,11 +211,11 @@ #define tqcrossCursor TQt::crossCursor #define tqwaitCursor TQt::waitCursor #define tqibeamCursor TQt::ibeamCursor -#define sizeVerCursor TQt::sizeVerCursor -#define sizeHorCursor TQt::sizeHorCursor -#define sizeBDiagCursor TQt::sizeBDiagCursor -#define sizeFDiagCursor TQt::sizeFDiagCursor -#define sizeAllCursor TQt::sizeAllCursor +#define tqsizeVerCursor TQt::sizeVerCursor +#define tqsizeHorCursor TQt::sizeHorCursor +#define tqsizeBDiagCursor TQt::sizeBDiagCursor +#define tqsizeFDiagCursor TQt::sizeFDiagCursor +#define tqsizeAllCursor TQt::sizeAllCursor #define tqblankCursor TQt::blankCursor #define tqsplitVCursor TQt::splitVCursor #define tqsplitHCursor TQt::splitHCursor diff --git a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp index a80f45227..203ed5643 100644 --- a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp +++ b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.cpp @@ -3079,7 +3079,7 @@ TQSizePolicy TQtMultiLineEdit::sizePolicy() const /*\reimp */ -TQSize TQtMultiLineEdit::sizeHint() const +TQSize TQtMultiLineEdit::tqsizeHint() const { constPolish(); int expected_lines; @@ -3113,9 +3113,9 @@ TQSize TQtMultiLineEdit::tqminimumSizeHint() const h += frameWidth(); w += frameWidth(); if ( testTableFlags(Tbl_hScrollBar|Tbl_autoHScrollBar) ) - w += verticalScrollBar()->sizeHint().width(); + w += verticalScrollBar()->tqsizeHint().width(); if ( testTableFlags(Tbl_vScrollBar|Tbl_autoVScrollBar) ) - h += horizontalScrollBar()->sizeHint().height(); + h += horizontalScrollBar()->tqsizeHint().height(); return TQSize(w,h); } diff --git a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h index a1abae75b..2e539eeeb 100644 --- a/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h +++ b/experimental/tqtinterface/qt4/src/attic/qtmultilineedit.h @@ -58,7 +58,7 @@ public: TQString textLine( int line ) const; int numLines() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; diff --git a/experimental/tqtinterface/qt4/src/attic/qttableview.cpp b/experimental/tqtinterface/qt4/src/attic/qttableview.cpp index 33bff8108..0872fa680 100644 --- a/experimental/tqtinterface/qt4/src/attic/qttableview.cpp +++ b/experimental/tqtinterface/qt4/src/attic/qttableview.cpp @@ -32,8 +32,8 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->sizeHint().height() -#define VSBEXT verticalScrollBar()->sizeHint().width() +#define HSBEXT horizontalScrollBar()->tqsizeHint().height() +#define VSBEXT verticalScrollBar()->tqsizeHint().width() class TQCornerSquare : public TQWidget // internal class @@ -1441,7 +1441,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // height is irrelevant + sb->resize( sb->tqsizeHint() ); // height is irrelevant TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( NoFocus ); @@ -1472,7 +1472,7 @@ TQScrollBar *TQtTableView::horizontalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // width is irrelevant + sb->resize( sb->tqsizeHint() ); // width is irrelevant sb->setFocusPolicy( NoFocus ); TQ_CHECK_PTR(sb); sb->setTracking( FALSE ); diff --git a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp index ec8635222..22ee9f4d5 100644 --- a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp +++ b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.cpp @@ -3714,10 +3714,10 @@ void TQCanvasView::drawContents( TQPainter * ) /*! Suggests a size sufficient to view the entire canvas. */ -TQSize TQCanvasView::sizeHint() const +TQSize TQCanvasView::tqsizeHint() const { if ( !canvas() ) - return TQScrollView::sizeHint(); + return TQScrollView::tqsizeHint(); // should maybe take transformations into account return ( canvas()->size() + 2 * TQSize(frameWidth(), frameWidth()) ) .boundedTo( 3 * TQApplication::desktop()->size() / 4 ); diff --git a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h index 3e6bfd744..2aaba6e64 100644 --- a/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h +++ b/experimental/tqtinterface/qt4/src/canvas/tqcanvas.h @@ -382,7 +382,7 @@ public: protected: void drawContents( TQPainter*, int cx, int cy, int cw, int ch ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; private: void drawContents( TQPainter* ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp index 2b7e1a090..cd1347694 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqcolordialog.cpp @@ -87,7 +87,7 @@ public: virtual void setCurrent( 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 & ); 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(); TQSize s = gridSize().boundedTo( TQSize(640, 480 ) ); @@ -642,7 +642,7 @@ Q_SIGNALS: void newCol( int h, int s ); protected: - TQSize sizeHint() const; + TQSize tqsizeHint() const; void drawContents(TQPainter* p); void mouseMoveEvent( TQMouseEvent * ); void mousePressEvent( TQMouseEvent * ); @@ -825,7 +825,7 @@ TQColorPicker::~TQColorPicker() delete pix; } -TQSize TQColorPicker::sizeHint() const +TQSize TQColorPicker::tqsizeHint() const { return TQSize( pWidth + 2*frameWidth(), pHeight + 2*frameWidth() ); } @@ -910,9 +910,9 @@ class TQColNumLineEdit : public TQLineEdit public: TQColNumLineEdit( TQWidget *tqparent, const char* name=0 ) : TQLineEdit( tqparent, name ) { setMaxLength( 3 );} - TQSize sizeHint() const { + TQSize tqsizeHint() const { return TQSize( fontMetrics().width( "999" ) + 2 * ( margin() + frameWidth() ), - TQLineEdit::sizeHint().height() ); } + TQLineEdit::tqsizeHint().height() ); } void setNum( int i ) { TQString s; s.setNum(i); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp index ef3157341..43db3cad4 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.cpp @@ -48,7 +48,7 @@ #include "tqobjectlist.h" #include "tqwidgetlist.h" #include "tqlayout.h" -#include "sizegrip.h" +#include "tqsizegrip.h" #include "tqwhatsthis.h" #include "tqpopupmenu.h" #include "tqcursor.h" @@ -148,7 +148,7 @@ dialog will initially appear as a partial dialog, but with a "More" toggle button. If the user presses the "More" button down, 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. If the orientation is \c Vertical the extension widget's width() will be expanded to the width() of the dialog. Extensibility is @@ -1050,7 +1050,7 @@ void TQDialog::showExtension( bool showIt ) if ( tqlayout() ) tqlayout()->setEnabled( FALSE ); #endif - TQSize s( d->extension->sizeHint() + TQSize s( d->extension->tqsizeHint() .expandedTo( d->extension->tqminimumSize() ) .boundedTo( d->extension->tqmaximumSize() ) ); if ( d->orientation == Qt::Horizontal ) { @@ -1078,18 +1078,18 @@ void TQDialog::showExtension( bool showIt ) /*! \reimp */ -TQSize TQDialog::sizeHint() const +TQSize TQDialog::tqsizeHint() const { if ( d->extension ) { if ( d->orientation == Qt::Horizontal ) - return TQSize( TQWidget::sizeHint().width(), - TQMAX( TQWidget::sizeHint().height(),d->extension->sizeHint().height() ) ); + return TQSize( TQWidget::tqsizeHint().width(), + TQMAX( TQWidget::tqsizeHint().height(),d->extension->tqsizeHint().height() ) ); else - return TQSize( TQMAX( TQWidget::sizeHint().width(), d->extension->sizeHint().width() ), - TQWidget::sizeHint().height() ); + return TQSize( TQMAX( TQWidget::tqsizeHint().width(), d->extension->tqsizeHint().width() ), + TQWidget::tqsizeHint().height() ); } - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } @@ -1150,7 +1150,7 @@ void TQDialog::setSizeGripEnabled(bool enabled) if ( enabled ) { d->resizer = new TQSizeGrip( this, "TQDialog::resizer" ); // adjustSize() processes all events, which is suboptimal - d->resizer->resize( d->resizer->sizeHint() ); + d->resizer->resize( d->resizer->tqsizeHint() ); if ( TQApplication::reverseLayout() ) d->resizer->move( rect().bottomLeft() -d->resizer->rect().bottomLeft() ); else diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h index a15389c08..972fc1df9 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqdialog.h @@ -84,7 +84,7 @@ public: void setExtension( TQWidget* extension ); TQWidget* extension() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void setSizeGripEnabled( bool ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp index 99309d8b4..8a86b71f4 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp @@ -63,7 +63,7 @@ public: : TQTextView( tqparent, name ) { } virtual TQSize tqminimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; }; TQSize TQErrorMessageTextView::tqminimumSizeHint() const @@ -71,7 +71,7 @@ TQSize TQErrorMessageTextView::tqminimumSizeHint() const return TQSize( 50, 50 ); } -TQSize TQErrorMessageTextView::sizeHint() const +TQSize TQErrorMessageTextView::tqsizeHint() const { return TQSize( 250, 75 ); } diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp index 221bec590..f92e18ebf 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp @@ -892,7 +892,7 @@ TQFDProgressDialog::TQFDProgressDialog( TQWidget *tqparent, const TQString &fn, TQPushButton *b = new TQPushButton( TQFileDialog::tr( "Cancel" ), this, "qt_cancel_btn" ); - b->setFixedSize( b->sizeHint() ); + b->setFixedSize( b->tqsizeHint() ); tqlayout->addWidget( b ); connect( b, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancelled() ) ); @@ -1180,7 +1180,7 @@ TQFileListBox::TQFileListBox( TQWidget *tqparent, TQFileDialog *dlg ) TQVBox *box = new TQVBox( viewport(), "qt_vbox" ); box->setFrameStyle( TQFrame::Box | TQFrame::Plain ); lined = new TQRenameEdit( box ); - lined->setFixedHeight( lined->sizeHint().height() ); + lined->setFixedHeight( lined->tqsizeHint().height() ); box->hide(); box->setBackgroundMode( TQt::PaletteBase ); renameTimer = new TQTimer( this ); @@ -1581,7 +1581,7 @@ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *tqparent, TQFi TQVBox *box = new TQVBox( viewport(), "qt_vbox" ); box->setFrameStyle( TQFrame::Box | TQFrame::Plain ); lined = new TQRenameEdit( box ); - lined->setFixedHeight( lined->sizeHint().height() ); + lined->setFixedHeight( lined->tqsizeHint().height() ); box->hide(); box->setBackgroundMode( TQt::PaletteBase ); renameTimer = new TQTimer( this ); @@ -2795,7 +2795,7 @@ void TQFileDialog::init() if ( screen.width() < 1024 || screen.height() < 768 ) { resize( TQMIN(screen.width(), 420), TQMIN(screen.height(), 236) ); } else { - TQSize s = files->sizeHint(); + TQSize s = files->tqsizeHint(); s = TQSize( s.width() + 300, s.height() + 82 ); if ( s.width() * 3 > screen.width() * 2 ) @@ -3894,20 +3894,20 @@ void TQFileDialog::updateGeometries() r.setHeight( TQMAX(r.height(),t.height()) ) // labels first - r = d->pathL->sizeHint(); - t = d->fileL->sizeHint(); + r = d->pathL->tqsizeHint(); + t = d->fileL->tqsizeHint(); RM; - t = d->typeL->sizeHint(); + t = d->typeL->tqsizeHint(); RM; - d->pathL->setFixedSize( d->pathL->sizeHint() ); + d->pathL->setFixedSize( d->pathL->tqsizeHint() ); d->fileL->setFixedSize( r ); d->typeL->setFixedSize( r ); // single-line input areas - r = d->paths->sizeHint(); - t = nameEdit->sizeHint(); + r = d->paths->tqsizeHint(); + t = nameEdit->tqsizeHint(); RM; - t = d->types->sizeHint(); + t = d->types->tqsizeHint(); RM; r.setWidth( t.width() * 2 / 3 ); t.setWidth( TQWIDGETSIZE_MAX ); @@ -3935,7 +3935,7 @@ r.setHeight( TQMAX(r.height(),t.height()) ) TQButton *b = 0; if ( !d->toolButtons.isEmpty() ) { 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 ) { @@ -3956,9 +3956,9 @@ r.setHeight( TQMAX(r.height(),t.height()) ) // open/save, cancel r = TQSize( 75, 20 ); - t = okB->sizeHint(); + t = okB->tqsizeHint(); RM; - t = cancelB->sizeHint(); + t = cancelB->tqsizeHint(); RM; okB->setFixedSize( r ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp index 76690917a..fbccfa8d4 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp @@ -227,9 +227,9 @@ TQFontDialog::TQFontDialog( TQWidget *tqparent, const char *name, connect( d->underline, TQT_SIGNAL(clicked()), TQT_SLOT(updateSample()) ); - (void)d->familyList->sizeHint(); - (void)d->styleList->sizeHint(); - (void)d->sizeList->sizeHint(); + (void)d->familyList->tqsizeHint(); + (void)d->styleList->tqsizeHint(); + (void)d->sizeList->tqsizeHint(); for (int i = 0; i < TQFont::NScripts; i++) { TQString scriptname = TQFontDatabase::scriptName((TQFont::Script) i); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp index 19dad1d9c..951826baf 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqinputdialog.cpp @@ -152,7 +152,7 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* tqparent, d->ok->setDefault( TRUE ); 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 ); 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( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - TQSize sh = sizeHint().expandedTo( TQSize(400, 10) ); + TQSize sh = tqsizeHint().expandedTo( TQSize(400, 10) ); setType( type ); resize( sh.width(), vbox->heightForWidth(sh.width()) ); } @@ -237,7 +237,7 @@ void TQInputDialog::setType( Type t ) } if ( input ) { d->stack->raiseWidget( input ); - d->stack->setFixedHeight( input->sizeHint().height() ); + d->stack->setFixedHeight( input->tqsizeHint().height() ); input->setFocus(); #ifndef TQT_NO_ACCEL d->label->setBuddy( input ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp index 9d89be5f1..79f6bfc57 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp @@ -1682,7 +1682,7 @@ void TQMessageBox::resizeButtons() int i; TQSize maxSize; 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.setHeight( TQMAX(maxSize.height(),s.height()) ); } diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp index fdfecfdb9..eb4a7948f 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp @@ -922,8 +922,8 @@ TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *tqparent, const char *na cancel->setText( tr("Cancel") ); horiz->addWidget( cancel ); - TQSize s1 = d->ok->sizeHint(); - TQSize s2 = cancel->sizeHint(); + TQSize s1 = d->ok->tqsizeHint(); + TQSize s2 = cancel->tqsizeHint(); s1 = TQSize( TQMAX(s1.width(), s2.width()), TQMAX(s1.height(), s2.height()) ); @@ -1139,7 +1139,7 @@ TQGroupBox * TQPrintDialog::setupDestination() int h = fontMetrics().height(); if ( d->printers->firstChild() ) h = d->printers->firstChild()->height(); - d->printers->setMinimumSize( d->printers->sizeHint().width(), + d->printers->setMinimumSize( d->printers->tqsizeHint().width(), d->printers->header()->height() + 3 * h ); horiz->addWidget( d->printers, 3 ); @@ -1271,9 +1271,9 @@ TQGroupBox * TQPrintDialog::setupOptions() connect( d->copies, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setNumCopies(int)) ); - TQSize s = d->firstPageLabel->sizeHint() - .expandedTo( d->lastPageLabel->sizeHint() ) - .expandedTo( l->sizeHint() ); + TQSize s = d->firstPageLabel->tqsizeHint() + .expandedTo( d->lastPageLabel->tqsizeHint() ) + .expandedTo( l->tqsizeHint() ); d->firstPageLabel->setMinimumSize( s ); d->lastPageLabel->setMinimumSize( s ); l->setMinimumSize( s.width() + 19, s.height() ); diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp index a6f04b69f..74bf69fe9 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp @@ -358,8 +358,8 @@ void TQProgressDialog::setLabel( TQLabel *label ) label->reparent( this, 0, TQPoint(0,0), FALSE ); } } - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); if (label) label->show(); @@ -384,8 +384,8 @@ void TQProgressDialog::setLabelText( const TQString &text ) { if ( label() ) { label()->setText( text ); - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); } } @@ -417,8 +417,8 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton ) d->cancel, TQT_SIGNAL(clicked()) ); #endif } - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); if (cancelButton) cancelButton->show(); @@ -439,8 +439,8 @@ void TQProgressDialog::setCancelButtonText( const TQString &cancelButtonText ) } else { setCancelButton(0); } - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); } @@ -462,8 +462,8 @@ void TQProgressDialog::setBar( TQProgressBar *bar ) } delete d->bar; d->bar = bar; - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); } @@ -610,8 +610,8 @@ void TQProgressDialog::setProgress( int progress ) } } if ( need_show ) { - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); show(); d->shown_once = TRUE; @@ -647,13 +647,13 @@ void TQProgressDialog::setProgress( int progress, int totalSteps ) need to call this yourself. */ -TQSize TQProgressDialog::sizeHint() const +TQSize TQProgressDialog::tqsizeHint() const { - TQSize sh = label()->sizeHint(); - TQSize bh = bar()->sizeHint(); + TQSize sh = label()->tqsizeHint(); + TQSize bh = bar()->tqsizeHint(); int h = margin_tb*2 + bh.height() + sh.height() + spacing; 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 ); } @@ -681,8 +681,8 @@ void TQProgressDialog::tqlayout() const bool centered = bool(tqstyle().tqstyleHint(TQStyle::SH_ProgressDialog_CenterCancelButton, this)); - TQSize cs = d->cancel ? d->cancel->sizeHint() : TQSize(0,0); - TQSize bh = bar()->sizeHint(); + TQSize cs = d->cancel ? d->cancel->tqsizeHint() : TQSize(0,0); + TQSize bh = bar()->tqsizeHint(); int cspc; int lh = 0; @@ -800,8 +800,8 @@ bool TQProgressDialog::autoClose() const void TQProgressDialog::showEvent( TQShowEvent *e ) { TQDialog::showEvent( e ); - int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); resize( w, h ); forceTimer->stop(); } diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h index b51404748..96ed191f9 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h +++ b/experimental/tqtinterface/qt4/src/dialogs/tqprogressdialog.h @@ -85,7 +85,7 @@ public: int totalSteps() const; int progress() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQString labelText() const; diff --git a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp index 70edca2e7..dc670a96a 100644 --- a/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp +++ b/experimental/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp @@ -936,7 +936,7 @@ void TQTabDialog::setSizes() int bh = s.height(); if ( d->ok ) { - s = d->ok->sizeHint(); + s = d->ok->tqsizeHint(); if ( s.width() > bw ) bw = s.width(); if ( s.height() > bh ) @@ -944,7 +944,7 @@ void TQTabDialog::setSizes() } if ( d->ab ) { - s = d->ab->sizeHint(); + s = d->ab->tqsizeHint(); if ( s.width() > bw ) bw = s.width(); if ( s.height() > bh ) @@ -952,7 +952,7 @@ void TQTabDialog::setSizes() } if ( d->db ) { - s = d->db->sizeHint(); + s = d->db->tqsizeHint(); if ( s.width() > bw ) bw = s.width(); if ( s.height() > bh ) @@ -960,7 +960,7 @@ void TQTabDialog::setSizes() } if ( d->hb ) { - s = d->hb->sizeHint(); + s = d->hb->tqsizeHint(); if ( s.width() > bw ) bw = s.width(); if ( s.height() > bh ) @@ -968,7 +968,7 @@ void TQTabDialog::setSizes() } if ( d->cb ) { - s = d->cb->sizeHint(); + s = d->cb->tqsizeHint(); if ( s.width() > bw ) bw = s.width(); if ( s.height() > bh ) diff --git a/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp b/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp index 87054cf25..e95ff47b6 100644 --- a/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp +++ b/experimental/tqtinterface/qt4/src/iconview/tqiconview.cpp @@ -6011,12 +6011,12 @@ void TQIconView::sort( bool ascending ) \reimp */ -TQSize TQIconView::sizeHint() const +TQSize TQIconView::tqsizeHint() const { constPolish(); if ( !d->firstItem ) - return TQScrollView::sizeHint(); + return TQScrollView::tqsizeHint(); if ( d->dirty && d->firstSizeHint ) { ( (TQIconView*)this )->resizeContents( TQMAX( 400, contentsWidth() ), diff --git a/experimental/tqtinterface/qt4/src/iconview/tqiconview.h b/experimental/tqtinterface/qt4/src/iconview/tqiconview.h index 0f6f78b85..9ca8a425d 100644 --- a/experimental/tqtinterface/qt4/src/iconview/tqiconview.h +++ b/experimental/tqtinterface/qt4/src/iconview/tqiconview.h @@ -386,7 +386,7 @@ public: bool eventFilter( TQObject * o, TQEvent * ); TQSize tqminimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; virtual void sort( bool ascending = TRUE ); diff --git a/experimental/tqtinterface/qt4/src/kernel/qt_kernel.pri b/experimental/tqtinterface/qt4/src/kernel/qt_kernel.pri index 492b7b5c0..aa76de0e8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/qt_kernel.pri +++ b/experimental/tqtinterface/qt4/src/kernel/qt_kernel.pri @@ -72,8 +72,8 @@ kernel { $$KERNEL_H/tqsignalmapper.h \ $$KERNEL_H/tqsignalslotimp.h \ $$KERNEL_H/tqsize.h \ - $$KERNEL_H/sizegrip.h \ - $$KERNEL_H/sizepolicy.h \ + $$KERNEL_H/tqsizegrip.h \ + $$KERNEL_H/tqsizepolicy.h \ $$KERNEL_H/tqsocketnotifier.h \ $$KERNEL_H/tqsound.h \ $$KERNEL_H/tqstyle.h \ @@ -222,7 +222,7 @@ kernel { $$KERNEL_CPP/tqsignal.cpp \ $$KERNEL_CPP/tqsignalmapper.cpp \ $$KERNEL_CPP/tqsize.cpp \ - $$KERNEL_CPP/sizegrip.cpp \ + $$KERNEL_CPP/tqsizegrip.cpp \ $$KERNEL_CPP/tqstyle.cpp \ $$KERNEL_CPP/tqsocketnotifier.cpp \ $$KERNEL_CPP/tqsound.cpp \ diff --git a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp index a40822ccf..4c15ee267 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp @@ -55,7 +55,7 @@ layouts. If \a b is TRUE, margin handling needs to be implemented in - setGeometry(), tqmaximumSize(), tqminimumSize(), sizeHint() and + setGeometry(), tqmaximumSize(), tqminimumSize(), tqsizeHint() and heightForWidth(). \sa supportsMargin() @@ -100,7 +100,7 @@ static int menuBarHeightForWidth( TQMenuBar *menubar, int w ) This is used by custom layouts. Pure virtual functions are provided to return information about - the tqlayout, including, sizeHint(), tqminimumSize(), tqmaximumSize() + the tqlayout, including, tqsizeHint(), tqminimumSize(), tqmaximumSize() and expandingDirections(). 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. */ @@ -403,7 +403,7 @@ void TQWidgetItem::setGeometry( const TQRect &r ) int x = r.x(); int y = r.y(); 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 ) s.setWidth( TQMIN( s.width(), pref.width() ) ); 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 - 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 it wants to grow in both dimensions and \c NoDirection means that it doesn't want to grow at all. @@ -657,7 +657,7 @@ TQSize TQWidgetItem::tqmaximumSize() const /*! Returns the preferred size of this spacer item. */ -TQSize TQSpacerItem::sizeHint() const +TQSize TQSpacerItem::tqsizeHint() const { return QSpacerItem::sizeHint(); } @@ -668,7 +668,7 @@ TQSize TQSpacerItem::sizeHint() const /*! Returns the preferred size of this spacer item. */ -TQSize TQSpacerItem::sizeHint() const +TQSize TQSpacerItem::tqsizeHint() const { return TQSize( width, height ); } @@ -678,13 +678,13 @@ TQSize TQSpacerItem::sizeHint() const /*! Returns the preferred size of this item. */ -TQSize TQWidgetItem::sizeHint() const +TQSize TQWidgetItem::tqsizeHint() const { TQSize s; if ( isEmpty() ) { s = TQSize( 0, 0 ); } else { - s = wid->sizeHint(); + s = wid->tqsizeHint(); if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).horData() == TQSizePolicy::Ignored ) s.setWidth( 1 ); if ( TQT_TQSIZEPOLICY_OBJECT(wid->sizePolicy()).verData() == TQSizePolicy::Ignored ) @@ -732,7 +732,7 @@ bool TQWidgetItem::isEmpty() const overview page \endlink for more information. 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 tqlayout isn't resized to zero size if there is too little space. To support tqchildren whose heights depend on their widths, implement @@ -1145,7 +1145,7 @@ TQSize TQLayout::totalSizeHint() const } int b = ( topLevel && !marginImpl ) ? 2 * outsideBorder : 0; - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); if ( hasHeightForWidth() ) s.setHeight( heightForWidth(s.width()) ); int h = b; @@ -1303,7 +1303,7 @@ TQSize TQLayout::tqmaximumSize() const /*! 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 it wants to grow in both dimensions. @@ -1390,7 +1390,7 @@ bool TQLayout::activate() if (ms.isValid()) mw->setMinimumSize( ms ); - // ideally only if sizeHint() or sizePolicy() has changed + // ideally only if tqsizeHint() or sizePolicy() has changed mw->updateGeometry(); return TRUE; } @@ -1421,7 +1421,7 @@ bool TQLayout::activate() The horizontal and vertical \l{SizeType}s are set in the usual constructor 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. \sa TQSizePolicy::SizeType @@ -1433,35 +1433,35 @@ bool TQLayout::activate() The per-dimension sizing types used when constructing a 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 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 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 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 - is no advantage to it being larger than sizeHint() (the default + is no advantage to it being larger than tqsizeHint() (the default 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 of extra space, so it should get as much space as possible (e.g. 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 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. */ @@ -1475,13 +1475,13 @@ bool TQLayout::activate() any direction. \value Horizontally the widget can usefully be wider than the - sizeHint(). + tqsizeHint(). \value Vertically the widget can usefully be taller than the - sizeHint(). + tqsizeHint(). \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 Returns TRUE if the widget can sensibly be narrower than its - sizeHint(); otherwise returns FALSE. + tqsizeHint(); otherwise returns FALSE. \sa mayShrinkVertically() mayGrowHorizontally() */ @@ -1552,7 +1552,7 @@ bool TQLayout::activate() \fn bool TQSizePolicy::mayShrinkVertically() const Returns TRUE if the widget can sensibly be shorter than its - sizeHint(); otherwise returns FALSE. + tqsizeHint(); otherwise returns FALSE. \sa mayShrinkHorizontally() mayGrowVertically() */ @@ -1561,7 +1561,7 @@ bool TQLayout::activate() \fn bool TQSizePolicy::mayGrowHorizontally() const Returns TRUE if the widget can sensibly be wider than its - sizeHint(); otherwise returns FALSE. + tqsizeHint(); otherwise returns FALSE. \sa mayGrowVertically() mayShrinkHorizontally() */ @@ -1570,7 +1570,7 @@ bool TQLayout::activate() \fn bool TQSizePolicy::mayGrowVertically() const Returns TRUE if the widget can sensibly be taller than its - sizeHint(); otherwise returns FALSE. + tqsizeHint(); otherwise returns FALSE. \sa mayGrowHorizontally() mayShrinkVertically() */ @@ -1579,7 +1579,7 @@ bool TQLayout::activate() \fn TQ_SPExpandData TQSizePolicy::expandingDirections() const 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 it wants to grow in both dimensions. @@ -1847,7 +1847,7 @@ TQGLayoutIterator::~TQGLayoutIterator() height-for-width (hasHeightForWidth()), this is the same as \c Minimium; otherwise, this is the 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. \value Minimum The main widget's minimum size is set to tqminimumSize(); it cannot be smaller. @@ -1953,7 +1953,7 @@ void TQLayout::setAutoAdd( bool b ) layouts. If \a b is TRUE, margin handling needs to be implemented in - setGeometry(), tqmaximumSize(), tqminimumSize(), sizeHint() and + setGeometry(), tqmaximumSize(), tqminimumSize(), tqsizeHint() and heightForWidth(). \sa supportsMargin() @@ -1968,12 +1968,12 @@ void TQLayout::setSupportsMargin( bool b ) this tqlayout is set to \a r, provided that this tqlayout supports 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. */ TQRect TQLayout::alignmentRect( const TQRect &r ) const { - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); int a = tqalignment(); /* diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp index b8c1c79a9..af193c986 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp @@ -2480,7 +2480,7 @@ void TQApplication::setColorSpec( int spec ) Example: \code - TQSize& WidgetClass::sizeHint() const + TQSize& WidgetClass::tqsizeHint() const { return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() ); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp~ b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp~ index 9e2bdd2a6..ff6077613 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp~ +++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp~ @@ -2480,7 +2480,7 @@ void TQApplication::setColorSpec( int spec ) Example: \code - TQSize& WidgetClass::sizeHint() const + TQSize& WidgetClass::tqsizeHint() const { return TQSize( 80, 25 ).expandedTo( TQApplication::globalStrut() ); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp index a5c86dd79..e9f5493d1 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp @@ -46,7 +46,7 @@ #include "tqwidget.h" #include "tqmenubar.h" #include "tqptrlist.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqlayoutengine_p.h" @@ -98,7 +98,7 @@ TQLayout *TQLayout::tqlayout() { return this; } -TQSize TQLayout::sizeHint() const { +TQSize TQLayout::tqsizeHint() const { return sizeHint(); } @@ -1451,7 +1451,7 @@ public: { item_ = TQT_TQLAYOUTITEM(new TQSpacerItem( w, h, hData, vData )); } ~TQGridBox() { delete item_; } - QSize sizeHint() const { return item_->sizeHint(); } + QSize tqsizeHint() const { return item_->sizeHint(); } QSize tqminimumSize() const { return item_->minimumSize(); } QSize tqmaximumSize() const { return item_->maximumSize(); } TQ_SPExpandData expandingDirections() const { return item_->expandingDirections(); } @@ -1505,7 +1505,7 @@ public: void add( TQGridBox*, int row, int col ); void add( TQGridBox*, int row1, int row2, int col1, int col2 ); - QSize sizeHint( int ) const; + QSize tqsizeHint( int ) const; QSize tqminimumSize( int ) const; QSize tqmaximumSize( int ) const; @@ -1650,7 +1650,7 @@ void TQGridLayoutData::recalcHFW( int w, int spacing ) int mh = 0; int n = 0; for ( int r = 0; r < rr; r++ ) { - h += rData[r].sizeHint; + h += rData[r].tqsizeHint; mh += rData[r].tqminimumSize; if ( !rData[r].empty ) n++; @@ -1765,9 +1765,9 @@ TQ_SPExpandData TQGridLayoutData::expanding( int spacing ) 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 @@ -1878,7 +1878,7 @@ void TQGridLayoutData::add( TQGridBox *box, int row1, int row2, int col1, void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c ) { - TQSize hint = box->sizeHint(); + TQSize hint = box->tqsizeHint(); TQSize minS = box->tqminimumSize(); TQSize maxS = box->tqmaximumSize(); @@ -1886,8 +1886,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c ) if ( !cStretch[box->col] ) colData[box->col].stretch = TQMAX( colData[box->col].stretch, box->hStretch() ); - colData[box->col].sizeHint = TQMAX( hint.width(), - colData[box->col].sizeHint ); + colData[box->col].tqsizeHint = TQMAX( hint.width(), + colData[box->col].tqsizeHint ); colData[box->col].tqminimumSize = TQMAX( minS.width(), colData[box->col].tqminimumSize ); @@ -1899,8 +1899,8 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c ) if ( !rStretch[box->row] ) rowData[box->row].stretch = TQMAX( rowData[box->row].stretch, box->vStretch() ); - rowData[box->row].sizeHint = TQMAX( hint.height(), - rowData[box->row].sizeHint ); + rowData[box->row].tqsizeHint = TQMAX( hint.height(), + rowData[box->row].tqsizeHint ); rowData[box->row].tqminimumSize = TQMAX( minS.height(), 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, int start, int end, - int minSize, int sizeHint, + int minSize, int tqsizeHint, TQMemArray<int> &stretchArray, int stretch ) { int i; @@ -1944,7 +1944,7 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing, int max = 0; for ( i = start; i <= end; i++ ) { w += chain[i].tqminimumSize; - wh += chain[i].sizeHint; + wh += chain[i].tqsizeHint; max += chain[i].tqmaximumSize; chain[i].empty = FALSE; if ( stretchArray[i] == 0 ) @@ -1983,11 +1983,11 @@ static void distributeMultiBox( TQMemArray<TQLayoutStruct> &chain, int spacing, } } - if ( wh < sizeHint ) { - qGeomCalc( chain, start, end - start + 1, 0, sizeHint, spacing ); + if ( wh < tqsizeHint ) { + qGeomCalc( chain, start, end - start + 1, 0, tqsizeHint, spacing ); for ( i = start; i <= end; i++ ) { - if ( chain[i].sizeHint < chain[i].size ) - chain[i].sizeHint = chain[i].size; + if ( chain[i].tqsizeHint < chain[i].size ) + chain[i].tqsizeHint = chain[i].size; } } } @@ -2031,7 +2031,7 @@ void TQGridLayoutData::setupLayoutData( int spacing ) if ( c2 < 0 ) c2 = cc - 1; - TQSize hint = box->sizeHint(); + TQSize hint = box->tqsizeHint(); TQSize min = box->tqminimumSize(); if ( box->hasHeightForWidth() ) has_hfw = TRUE; @@ -2065,13 +2065,13 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width ) TQMemArray<TQLayoutStruct> &rData = *hfwData; if ( box->hasHeightForWidth() ) { 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 ); } else { - TQSize hint = box->sizeHint(); + TQSize hint = box->tqsizeHint(); TQSize minS = box->tqminimumSize(); - rData[box->row].sizeHint = TQMAX( hint.height(), - rData[box->row].sizeHint ); + rData[box->row].tqsizeHint = TQMAX( hint.height(), + rData[box->row].tqsizeHint ); rData[box->row].tqminimumSize = TQMAX( minS.height(), rData[box->row].tqminimumSize ); } @@ -2079,7 +2079,7 @@ void TQGridLayoutData::addHfwData( TQGridBox *box, int width ) /* 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. */ void TQGridLayoutData::setupHfwLayoutData( int spacing ) @@ -2088,7 +2088,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing ) int i; for ( i = 0; i < rr; i++ ) { rData[i] = rowData[i]; - rData[i].tqminimumSize = rData[i].sizeHint = 0; + rData[i].tqminimumSize = rData[i].tqsizeHint = 0; } TQPtrListIterator<TQGridBox> it( things ); TQGridBox * box; @@ -2114,7 +2114,7 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing ) if ( r1 == r2 ) { addHfwData( box, w ); } else { - TQSize hint = box->sizeHint(); + TQSize hint = box->tqsizeHint(); TQSize min = box->tqminimumSize(); if ( box->hasHeightForWidth() ) { int hfwh = box->heightForWidth( w ); @@ -2465,9 +2465,9 @@ int TQGridLayout::numCols() const /*! 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 aggressively than in previous versions of TQt. A non-default 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 \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 fill the available space but should be sized according to - sizeHint(). + tqsizeHint(). \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 fill the available space but should be sized according to - sizeHint(). + tqsizeHint(). \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 - 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 it wants to grow in both dimensions. */ @@ -2998,7 +2998,7 @@ public: int hfwWidth; int hfwHeight; int hfwMinHeight; - TQSize sizeHint; + TQSize tqsizeHint; TQSize minSize; TQSize maxSize; TQ_SPExpandData expanding; @@ -3206,13 +3206,13 @@ TQBoxLayout::~TQBoxLayout() /*! Returns the preferred size of this box tqlayout. */ -TQSize TQBoxLayout::sizeHint() const +TQSize TQBoxLayout::tqsizeHint() const { if ( data->dirty ) { TQBoxLayout *that = (TQBoxLayout*)this; 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 - 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 it wants to grow in both dimensions. */ @@ -3362,7 +3362,7 @@ void TQBoxLayout::setGeometry( const TQRect &r ) for ( int i = 0; i < n; i++ ) { TQBoxLayoutItem *box = data->list.at( i ); if ( box->item->hasHeightForWidth() ) - a[i].sizeHint = a[i].tqminimumSize = + a[i].tqsizeHint = a[i].tqminimumSize = 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 aggressively than in previous versions of TQt. A non-default 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() */ @@ -3592,7 +3592,7 @@ void TQBoxLayout::addStretch( int stretch ) From TQt 3.0, the \a tqalignment parameter is interpreted more aggressively than in previous versions of TQt. A non-default 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() */ @@ -3717,7 +3717,7 @@ void TQBoxLayout::setDirection( Direction direction ) if ( sp ) { if ( sp->expandingDirections() == TQSizePolicy::NoDirection ) { //spacing or strut - TQSize s = sp->sizeHint(); + TQSize s = sp->tqsizeHint(); sp->changeSize( s.height(), s.width(), horz(direction) ? TQSizePolicy::Fixed:TQSizePolicy::Minimum, horz(direction) ? TQSizePolicy::Minimum:TQSizePolicy::Fixed ); @@ -3795,7 +3795,7 @@ void TQBoxLayout::setupGeom() minh = TQMAX( minh, min.height() ); hinth = TQMAX( hinth, hint.height() ); - a[i].sizeHint = hint.width(); + a[i].tqsizeHint = hint.width(); a[i].tqmaximumSize = max.width(); a[i].tqminimumSize = min.width(); a[i].expansive = expand; @@ -3812,7 +3812,7 @@ void TQBoxLayout::setupGeom() minw = TQMAX( minw, min.width() ); hintw = TQMAX( hintw, hint.width() ); - a[i].sizeHint = hint.height(); + a[i].tqsizeHint = hint.height(); a[i].tqmaximumSize = max.height(); a[i].tqminimumSize = min.height(); a[i].expansive = expand; @@ -3831,7 +3831,7 @@ void TQBoxLayout::setupGeom() ( (horexp ? TQSizePolicy::Horizontally : 0) | (verexp ? TQSizePolicy::Vertically : 0) ); - data->sizeHint = TQSize( hintw, hinth ) + data->tqsizeHint = TQSize( hintw, hinth ) .expandedTo( data->minSize ) .boundedTo( data->maxSize ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h index d96483815..5423cad5b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h @@ -52,7 +52,7 @@ #ifndef TQT_H #include "tqobject.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqwidget.h" #endif // TQT_H @@ -170,7 +170,7 @@ public: virtual inline void tqinvalidate() { QLayoutItem::invalidate(); } 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 tqmaximumSize() const { return QLayoutItem::maximumSize(); } // inline virtual void setGeometry( const TQRect&r ) { QLayoutItem::setGeometry(r); } @@ -178,7 +178,7 @@ public: // inline virtual TQ_SPExpandData expandingDirections() const { return QLayoutItem::expandingDirections(); } // 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 tqmaximumSize() const { return maximumSize(); } // 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 way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. #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 maximumSize() const { return tqmaximumSize(); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ @@ -211,7 +211,7 @@ public: // virtual int heightForWidth( int ) const; // virtual TQLayoutIterator iterator(); // -// virtual TQSize sizeHint() const = 0; +// virtual TQSize tqsizeHint() const = 0; // virtual TQSize tqminimumSize() const = 0; // virtual TQSize tqmaximumSize() const = 0; // virtual void setGeometry( const TQRect& ) = 0; @@ -223,7 +223,7 @@ public: // // 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 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 maximumSize() const { return tqmaximumSize(); } // inline void setGeometry( const QRect &r ) { return TQLayoutItem::setGeometry( r ); } @@ -240,7 +240,7 @@ class TQ_EXPORT TQLayoutItem public: TQLayoutItem( int tqalignment = 0 ) : align( tqalignment ) { } virtual ~TQLayoutItem(); - virtual TQSize sizeHint() const = 0; + virtual TQSize tqsizeHint() const = 0; virtual TQSize tqminimumSize() const = 0; virtual TQSize tqmaximumSize() const = 0; virtual TQ_SPExpandData expandingDirections() const = 0; @@ -278,7 +278,7 @@ public: TQ_SPExpandData expandingDirections() const; // Used by tqabstractlayout.cpp bool isEmpty() const; // Used by tqabstractlayout.cpp - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; void setGeometry( const TQRect &qr ); @@ -287,7 +287,7 @@ public: // 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 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 maximumSize() const { return tqmaximumSize(); } inline void setGeometry( const QRect &r ) { return TQSpacerItem::setGeometry( TQT_TQRECT_OBJECT(r) ); } @@ -306,7 +306,7 @@ public: void changeSize( int w, int h, TQSizePolicy::SizeType hData = TQSizePolicy::Minimum, TQSizePolicy::SizeType vData = TQSizePolicy::Minimum ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; TQ_SPExpandData expandingDirections() const; @@ -328,7 +328,7 @@ class TQ_EXPORT TQWidgetItem : public TQLayoutItem { public: TQWidgetItem( TQWidget *w ) : wid( w ) { } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; TQ_SPExpandData expandingDirections() const; @@ -369,7 +369,7 @@ public: virtual TQ_SPExpandData expandingDirections() const; TQLayout *tqlayout(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSize() const; virtual TQSize tqmaximumSize() const; @@ -652,7 +652,7 @@ inline void TQLayoutIterator::deleteCurrent() int count() const; \ TQLayoutItem* itemAt(int index) const; \ 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 maximumSize() const { return tqmaximumSize(); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ @@ -720,7 +720,7 @@ public: delete hack; } - inline TQSize sizeHint() const { return sizeHint(); } + inline TQSize tqsizeHint() const { return sizeHint(); } inline TQSize tqminimumSize() const { return minimumSize(); } inline TQSize tqmaximumSize() const { return maximumSize(); } inline void tqinvalidate() { invalidate(); } @@ -956,7 +956,7 @@ public: int spacing = -1, const char *name = 0 ); ~TQGridLayout(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; @@ -1064,7 +1064,7 @@ public: bool setStretchFactor( TQWidget*, int stretch ); bool setStretchFactor( TQLayout *l, int stretch ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp index 8c364d9a3..7dca5e0e6 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp @@ -256,7 +256,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i ) if ( TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayShrinkHorizontally() ) { s.setWidth( w->tqminimumSizeHint().width() ); } else { - sh = w->sizeHint(); + sh = w->tqsizeHint(); s.setWidth( sh.width() ); } } @@ -266,7 +266,7 @@ TQ_EXPORT TQSize tqSmartMinSize( const TQWidgetItem *i ) s.setHeight( w->tqminimumSizeHint().height() ); } else { 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(); if ( s.width() == TQWIDGETSIZE_MAX && !(align & TQt::AlignHorizontal_Mask) ) 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 ( !TQT_TQSIZEPOLICY_OBJECT(w->sizePolicy()).mayGrowVertically() ) - s.setHeight( w->sizeHint().height() ); + s.setHeight( w->tqsizeHint().height() ); s = s.expandedTo( w->tqminimumSize() ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine_p.h b/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine_p.h index bf6876e54..9c8064b21 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine_p.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine_p.h @@ -69,19 +69,19 @@ struct TQLayoutStruct { inline void init( int stretchFactor = 0, int spacing = 0 ) { stretch = stretchFactor; - tqminimumSize = sizeHint = spacing; + tqminimumSize = tqsizeHint = spacing; tqmaximumSize = TQLAYOUTSIZE_MAX; expansive = FALSE; empty = TRUE; } TQCOORD smartSizeHint() { - return ( stretch > 0 ) ? tqminimumSize : sizeHint; + return ( stretch > 0 ) ? tqminimumSize : tqsizeHint; } // parameters int stretch; - TQCOORD sizeHint; + TQCOORD tqsizeHint; TQCOORD tqmaximumSize; TQCOORD tqminimumSize; bool expansive; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp index 5e87d6f7b..9bec0241f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp @@ -817,7 +817,7 @@ void TQObject::timerEvent( TQTimerEvent * ) TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); \endcode in functions that depend on the state. One notable example is - TQWidget::sizeHint(). + TQWidget::tqsizeHint(). \sa event(), TQChildEvent */ @@ -1774,7 +1774,7 @@ void TQObject::timerEvent( TQTimerEvent * ) TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); \endcode in functions that depend on the state. One notable example is - TQWidget::sizeHint(). + TQWidget::tqsizeHint(). \sa event(), TQChildEvent */ diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp index c518cc7b1..8b614d610 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp @@ -8232,7 +8232,7 @@ TQTextTableCell::~TQTextTableCell() richtext = 0; } -TQSize TQTextTableCell::sizeHint() const +TQSize TQTextTableCell::tqsizeHint() const { int extra = 2 * (parent->innerborder + parent->cellpadding + border_tolerance); int used = richtext->widthUsed() + extra; @@ -16164,7 +16164,7 @@ void TQTextTable::resize( int nwidth ) width = nwidth; tqlayout->tqinvalidate(); - int shw = tqlayout->sizeHint().width() + 2*outerborder; + int shw = tqlayout->tqsizeHint().width() + 2*outerborder; int mw = tqlayout->tqminimumSize().width() + 2*outerborder; if ( stretch ) width = TQMAX( mw, nwidth ); @@ -16488,7 +16488,7 @@ TQTextTableCell::~TQTextTableCell() richtext = 0; } -TQSize TQTextTableCell::sizeHint() const +TQSize TQTextTableCell::tqsizeHint() const { int extra = 2 * ( tqparent->innerborder + tqparent->cellpadding + border_tolerance); int used = richtext->widthUsed() + extra; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h index 291d70869..b9cbd98a3 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h @@ -615,7 +615,7 @@ public: TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc); virtual ~TQTextTableCell(); - TQSize sizeHint() const ; + TQSize tqsizeHint() const ; TQSize tqminimumSize() const ; TQSize tqmaximumSize() const ; Qt::Orientations expandingDirections() const; @@ -2788,7 +2788,7 @@ public: TQMimeSourceFactory &factory, TQStyleSheet *sheet, const TQString& doc ); virtual ~TQTextTableCell(); - TQSize sizeHint() const ; + TQSize tqsizeHint() const ; TQSize tqminimumSize() const ; TQSize tqmaximumSize() const ; TQ_SPExpandData expandingDirections() const; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp index f47665133..bcea2dbec 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "sizegrip.h" +#include "tqsizegrip.h" #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. @@ -153,9 +153,9 @@ TQSizeGrip::~TQSizeGrip() /*! 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())); } diff --git a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h index 2a01172ee..fa893a286 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqsizegrip.h @@ -55,7 +55,7 @@ public: TQSizeGrip( TQWidget* tqparent, const char* name=0 ); ~TQSizeGrip(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent( TQPaintEvent * ); diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h index ce58adb2d..5d657d854 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.h @@ -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_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); } @@ -487,7 +487,7 @@ public: 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 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 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; diff --git a/experimental/tqtinterface/qt4/src/kernel/tqt.h b/experimental/tqtinterface/qt4/src/kernel/tqt.h index e88f88ef3..3e1fefa60 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqt.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqt.h @@ -44,7 +44,7 @@ #include <stdio.h> #include "tqtextstream.h" #include "tqfontinfo.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqtl.h" #include "tqsize.h" #include "tqrect.h" @@ -195,7 +195,7 @@ #include <tqsignalslotimp.h> #include <tqsimplerichtext.h> #include "tqwmatrix.h" -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqabstractlayout.h> #include <tqsjiscodec.h> #include <tqslider.h> diff --git a/experimental/tqtinterface/qt4/src/kernel/tqtglobaldefines.h b/experimental/tqtinterface/qt4/src/kernel/tqtglobaldefines.h index 35de7c745..7fc31682f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtglobaldefines.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqtglobaldefines.h @@ -195,11 +195,11 @@ // #define tqcrossCursor Qt::CrossCursor // #define tqwaitCursor Qt::WaitCursor // #define tqibeamCursor Qt::IBeamCursor -// #define sizeVerCursor Qt::SizeVerCursor -// #define sizeHorCursor Qt::SizeHorCursor -// #define sizeBDiagCursor Qt::SizeBDiagCursor -// #define sizeFDiagCursor Qt::SizeFDiagCursor -// #define sizeAllCursor Qt::SizeAllCursor +// #define tqsizeVerCursor Qt::SizeVerCursor +// #define tqsizeHorCursor Qt::SizeHorCursor +// #define tqsizeBDiagCursor Qt::SizeBDiagCursor +// #define tqsizeFDiagCursor Qt::SizeFDiagCursor +// #define tqsizeAllCursor Qt::SizeAllCursor // #define tqblankCursor Qt::BlankCursor // #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitHCursor Qt::SplitHCursor @@ -213,11 +213,11 @@ #define tqcrossCursor TQt::crossCursor #define tqwaitCursor TQt::waitCursor #define tqibeamCursor TQt::ibeamCursor -#define sizeVerCursor TQt::sizeVerCursor -#define sizeHorCursor TQt::sizeHorCursor -#define sizeBDiagCursor TQt::sizeBDiagCursor -#define sizeFDiagCursor TQt::sizeFDiagCursor -#define sizeAllCursor TQt::sizeAllCursor +#define tqsizeVerCursor TQt::sizeVerCursor +#define tqsizeHorCursor TQt::sizeHorCursor +#define tqsizeBDiagCursor TQt::sizeBDiagCursor +#define tqsizeFDiagCursor TQt::sizeFDiagCursor +#define tqsizeAllCursor TQt::sizeAllCursor #define tqblankCursor TQt::blankCursor #define tqsplitVCursor TQt::splitVCursor #define tqsplitHCursor TQt::splitHCursor diff --git a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp index e80e19057..bd022e148 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp @@ -60,7 +60,7 @@ #include "tqbitmap.h" #include "tqcursor.h" #include "tqdatetime.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqshared.h" #include "tqbitarray.h" #include "tqkeysequence.h" diff --git a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new index 3e4141513..22c05b3c8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new +++ b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new @@ -60,7 +60,7 @@ #include "tqbitmap.h" #include "tqcursor.h" #include "tqdatetime.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqshared.h" #include "tqbitarray.h" #include "tqkeysequence.h" diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp index c9d59d239..3bfdd86fd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp @@ -302,7 +302,7 @@ const TQRect TQWidget::tqgeometry() const { } QSize TQWidget::sizeHint() const { - return sizeHint(); + return tqsizeHint(); } QSize TQWidget::minimumSizeHint() const { @@ -436,7 +436,7 @@ void TQWidget::tqrepaint(const QRegion &rgn, bool) { repaint(rgn); } -TQSizePolicy TQWidget::sizePolicy() const { +TQSizePolicy TQWidget::tqsizePolicy() const { return TQT_TQSIZEPOLICY_OBJECT(sizePolicy()); } @@ -1447,13 +1447,13 @@ TQStyle* TQWidget::setStyle( const TQString &style ) } /*! - \property TQWidget::sizeHint + \property TQWidget::tqsizeHint \brief the recommended size for the widget If the value of this property is an invalid size, no size is recommended. - The default implementation of sizeHint() returns an invalid size + The default implementation of tqsizeHint() returns an invalid size if there is no tqlayout for this widget, and returns the tqlayout's preferred size otherwise. @@ -1461,7 +1461,7 @@ TQStyle* TQWidget::setStyle( const TQString &style ) setMinimumSize(), updateGeometry() */ -TQSize TQWidget::sizeHint() const +TQSize TQWidget::tqsizeHint() const { #ifndef TQT_NO_LAYOUT if ( tqlayout() ) @@ -2624,11 +2624,11 @@ int TQWidget::x11Depth() const { /*! Adjusts the size of the widget to fit the contents. - Uses sizeHint() if valid (i.e if the size hint's width and height + Uses tqsizeHint() if valid (i.e if the size hint's width and height are \>= 0), otherwise sets the size to the tqchildren rectangle (the union of all child widget geometries). - \sa sizeHint(), tqchildrenRect() + \sa tqsizeHint(), tqchildrenRect() */ void TQWidget::adjustSize() @@ -2637,7 +2637,7 @@ void TQWidget::adjustSize() TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); if ( !testWState(WState_Polished) ) polish(); - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); if ( isTopLevel() ) { @@ -2819,7 +2819,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { height(), sizePolicy(), tqsetSizePolicy(), - sizeHint(), + tqsizeHint(), updateGeometry(), tqlayout(), move(), @@ -3091,11 +3091,11 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { \i In the constructor, be sure to set up your member variables early on, before there's any chance that you might receive an event. - \i It is almost always useful to reimplement sizeHint() and to set + \i It is almost always useful to reimplement tqsizeHint() and to set the correct size policy with tqsetSizePolicy(), so users of your class can set up tqlayout management more easily. A size policy lets you supply good defaults for the tqlayout management handling, so that - other widgets can contain and manage yours easily. sizeHint() + other widgets can contain and manage yours easily. tqsizeHint() indicates a "good" size for the widget. \i If your widget is a top-level window, setCaption() and setIcon() set @@ -3205,7 +3205,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { #endif TQSize qt_naturalWidgetSize( TQWidget *w ) { - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); TQ_SPExpandData exp; #ifndef TQT_NO_LAYOUT if ( w->tqlayout() ) { @@ -4911,7 +4911,7 @@ void TQWidget::setMaximumHeight( int h ) Sets both the minimum and maximum width of the widget to \a w without changing the heights. Provided for convenience. - \sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() + \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize() */ void TQWidget::setFixedWidth( int w ) @@ -4925,7 +4925,7 @@ void TQWidget::setFixedWidth( int w ) Sets both the minimum and maximum heights of the widget to \a h without changing the widths. Provided for convenience. - \sa sizeHint() tqminimumSize() tqmaximumSize() setFixedSize() + \sa tqsizeHint() tqminimumSize() tqmaximumSize() setFixedSize() */ void TQWidget::setFixedHeight( int h ) @@ -6895,7 +6895,7 @@ void TQWidget::polish() Ensures that the widget is properly initialized by calling polish(). - Call constPolish() from functions like sizeHint() that depends on + Call constPolish() from functions like tqsizeHint() that depends on the widget being initialized, and that may be called before show(). @@ -7134,11 +7134,11 @@ TQRegion TQWidget::clipRegion() const /*! Adjusts the size of the widget to fit the contents. - Uses sizeHint() if valid (i.e if the size hint's width and height + Uses tqsizeHint() if valid (i.e if the size hint's width and height are \>= 0), otherwise sets the size to the tqchildren rectangle (the union of all child widget geometries). - \sa sizeHint(), tqchildrenRect() + \sa tqsizeHint(), tqchildrenRect() */ void TQWidget::adjustSize() @@ -7147,7 +7147,7 @@ void TQWidget::adjustSize() TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); if ( !testWState(WState_Polished) ) polish(); - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); if ( isTopLevel() ) { @@ -7184,13 +7184,13 @@ void TQWidget::adjustSize() /*! - \property TQWidget::sizeHint + \property TQWidget::tqsizeHint \brief the recommended size for the widget If the value of this property is an invalid size, no size is recommended. - The default implementation of sizeHint() returns an invalid size + The default implementation of tqsizeHint() returns an invalid size if there is no tqlayout for this widget, and returns the tqlayout's preferred size otherwise. @@ -7198,7 +7198,7 @@ void TQWidget::adjustSize() setMinimumSize(), updateGeometry() */ -TQSize TQWidget::sizeHint() const +TQSize TQWidget::tqsizeHint() const { #ifndef TQT_NO_LAYOUT if ( tqlayout() ) @@ -8455,7 +8455,7 @@ void TQWidget::setLayout( TQLayout *l ) The default policy is Preferred/Preferred, which means that the widget can be freely resized, but prefers to be the size - sizeHint() returns. Button-like widgets set the size policy to + tqsizeHint() returns. Button-like widgets set the size policy to specify that they may stretch horizontally, but are fixed vertically. The same applies to lineedit controls (such as TQLineEdit, TQSpinBox or an editable TQComboBox) and other @@ -8466,9 +8466,9 @@ void TQWidget::setLayout( TQLayout *l ) respective direction only. Widgets that can provide scrollbars (usually subclasses of TQScrollView) tend to specify that they can use additional space, and that they can make do with less than - sizeHint(). + tqsizeHint(). - \sa sizeHint() TQLayout TQSizePolicy updateGeometry() + \sa tqsizeHint() TQLayout TQSizePolicy updateGeometry() */ TQSizePolicy TQWidget::sizePolicy() const { @@ -8580,7 +8580,7 @@ TQWidget *TQWidget::tqchildAt( const TQPoint & p, bool includeThis ) const Notifies the tqlayout system that this widget has changed and may need to change tqgeometry. - Call this function if the sizeHint() or sizePolicy() have changed. + Call this function if the tqsizeHint() or sizePolicy() have changed. For explicitly hidden widgets, updateGeometry() is a no-op. The tqlayout system will be notified as soon as the widget is shown. diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h index 4f0e36b90..c0274646c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h @@ -51,7 +51,7 @@ #include "tqfont.h" #include "tqfontmetrics.h" #include "tqfontinfo.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqbitmap.h" #endif // TQT_H @@ -244,7 +244,7 @@ public: TQObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); const TQRect tqgeometry() const; TQLayout *tqlayout() const; - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSizeHint() const; virtual QSize sizeHint() const; virtual QSize minimumSizeHint() const; @@ -286,7 +286,7 @@ public: void tqrepaint(int x, int y, int w, int h, bool); void tqrepaint(const QRect &r, bool); void tqrepaint(const QRegion &rgn, bool); - TQSizePolicy sizePolicy() const; + TQSizePolicy tqsizePolicy() const; TQPoint backgroundOffset() const; bool tqsignalsBlocked() 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 maximized READ isMaximized ) 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( TQRect microFocusHint READ microFocusHint ) Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops ) @@ -900,7 +900,7 @@ public: uint windowState() const; void setWindowState(uint windowState); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSizeHint() const; virtual TQSizePolicy sizePolicy() const; virtual void tqsetSizePolicy( TQSizePolicy ); diff --git a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp index bcb2120bd..8412c94ee 100644 --- a/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp +++ b/experimental/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp @@ -344,7 +344,7 @@ update. For example: */ -//## possibly add sizeHint parameter +//## possibly add tqsizeHint parameter bool TQSqlCursorManager::tqfindBuffer( const TQSqlIndex& idx, int atHint ) { #ifdef TQT_DEBUG_DATAMANAGER diff --git a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp index 252a1ff79..c69fea7f2 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp @@ -1187,7 +1187,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQWidget *widget) const TQDialogButtons::Help }; for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); 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()); if(dbtns->orientation() == Qt::Horizontal) { start -= mwidth; @@ -2458,7 +2458,7 @@ int TQCommonStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const /*! \reimp */ -TQSize TQCommonStyle::sizeFromContents(ContentsType contents, +TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -2467,7 +2467,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents, #if defined(TQT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::sizeFromContents: widget parameter cannot be zero!"); + qWarning("TQCommonStyle::tqsizeFromContents: widget parameter cannot be zero!"); return sz; } #endif @@ -2492,7 +2492,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents, TQDialogButtons::Help }; for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); 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()); if(dbtns->orientation() == Qt::Horizontal) h = TQMAX(h, mheight); @@ -2587,8 +2587,8 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents, int w = sz.width(), h = sz.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan()) h += 8; } else if ( mi->widget() ) { diff --git a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h index d9e7244d4..ef01d8958 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h @@ -127,7 +127,7 @@ public: int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; - TQSize sizeFromContents( ContentsType s, + TQSize tqsizeFromContents( ContentsType s, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp index 9d5001152..44cd711b4 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp @@ -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 ); } 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; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp index 62edca778..257c0ad81 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp @@ -1730,7 +1730,7 @@ TQRect TQMotifStyle::querySubControlMetrics( TQ_ComplexControl control, /*!\reimp */ -TQSize TQMotifStyle::sizeFromContents( ContentsType contents, +TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1742,7 +1742,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents, { #ifndef TQT_NO_PUSHBUTTON 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()) && sz.width() < 80 && ! button->pixmap()) sz.setWidth(80); @@ -1763,8 +1763,8 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents, int w = sz.width(), h = sz.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan()) h += 2*motifItemVMargin + 2*motifItemFrame; } else if ( mi->widget() ) { @@ -1802,7 +1802,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, opt ); + sz = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h index be7abf96e..f5d6a52b4 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h @@ -109,7 +109,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize sizeFromContents( ContentsType contents, + TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp index 24c778730..6b8a17bf3 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp @@ -1365,7 +1365,7 @@ void TQSGIStyle::tqdrawComplexControl( TQ_ComplexControl control, /*!\reimp */ -TQSize TQSGIStyle::sizeFromContents( ContentsType contents, +TQSize TQSGIStyle::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1380,7 +1380,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents, break; TQMenuItem *mi = opt.menuItem(); - sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, + sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); // SGI checkmark items needs a bit more room const TQPopupMenu *popup = (TQPopupMenu *) widget; @@ -1397,7 +1397,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents, break; default: - sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, opt ); + sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h index 38e203a2e..5ae9889d0 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h @@ -103,7 +103,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize sizeFromContents( ContentsType contents, + TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp index c766c2d53..aa65a5b94 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp @@ -1169,7 +1169,7 @@ int TQWindowsStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) co /*! \reimp */ -TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, +TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1181,7 +1181,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, { #ifndef TQT_NO_PUSHBUTTON 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 defwidth = 0; @@ -1211,8 +1211,8 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, int w = sz.width(), h = sz.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan()) h += 2*windowsItemVMargin + 2*windowsItemFrame; } else if ( mi->widget() ) { @@ -1261,7 +1261,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::sizeFromContents(contents, widget, sz, opt); + sz = TQCommonStyle::tqsizeFromContents(contents, widget, sz, opt); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h index e1aed6c18..a5a6fe9a3 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h @@ -104,7 +104,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize sizeFromContents( ContentsType contents, + TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/table/tqtable.cpp b/experimental/tqtinterface/qt4/src/table/tqtable.cpp index 6ef5b4fde..d87914f68 100644 --- a/experimental/tqtinterface/qt4/src/table/tqtable.cpp +++ b/experimental/tqtinterface/qt4/src/table/tqtable.cpp @@ -786,7 +786,7 @@ TQTable::viewport() as tqparent. If you reimplement this function you'll almost certainly need to reimplement setContentFromEditor(), and may need to reimplement -sizeHint(). +tqsizeHint(). \quotefile table/statistics/statistics.cpp \skipto createEditor @@ -960,11 +960,11 @@ TQString TQTableItem::key() const function. */ -TQSize TQTableItem::sizeHint() const +TQSize TQTableItem::tqsizeHint() const { TQSize strutSize = TQApplication::globalStrut(); 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; int x = 0; @@ -1461,11 +1461,11 @@ int TQComboTableItem::rtti() const /*! \reimp */ -TQSize TQComboTableItem::sizeHint() const +TQSize TQComboTableItem::tqsizeHint() const { fakeCombo->insertItem( currentText() ); fakeCombo->setCurrentItem( fakeCombo->count() - 1 ); - TQSize sh = fakeCombo->sizeHint(); + TQSize sh = fakeCombo->tqsizeHint(); fakeCombo->removeItem( fakeCombo->count() - 1 ); return sh.expandedTo( TQApplication::globalStrut() ); } @@ -1647,12 +1647,12 @@ int TQCheckTableItem::rtti() const /*! \reimp */ -TQSize TQCheckTableItem::sizeHint() const +TQSize TQCheckTableItem::tqsizeHint() const { TQSize sz = TQSize( table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ), table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); sz.setWidth( sz.width() + 6 ); - TQSize sh( TQTableItem::sizeHint() ); + TQSize sh( TQTableItem::tqsizeHint() ); return TQSize( sh.width() + sz.width(), TQMAX( sh.height(), sz.height() ) ). expandedTo( TQApplication::globalStrut() ); } @@ -4329,7 +4329,7 @@ void TQTable::focusOutEvent( TQFocusEvent* tqfe ) /*! \reimp */ -TQSize TQTable::sizeHint() const +TQSize TQTable::tqsizeHint() const { if ( cachedSizeHint().isValid() ) return cachedSizeHint(); @@ -4342,7 +4342,7 @@ TQSize TQTable::sizeHint() const sh = TQSize( tableSize().width() + VERTICALMARGIN + 5, tableSize().height() + topMargin() + 5 ); } else { - sh = TQScrollView::sizeHint(); + sh = TQScrollView::tqsizeHint(); if ( !topHeader->isHidden() ) sh.setHeight( sh.height() + topHeader->height() ); 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<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<TableWidget> tmp2; @@ -5824,12 +5824,12 @@ void TQTable::adjustColumn( int col ) if ( !itm ) { TQWidget *widget = cellWidget( i, col ); if ( widget ) - w = TQMAX( w, widget->sizeHint().width() ); + w = TQMAX( w, widget->tqsizeHint().width() ); } else { if ( itm->colSpan() > 1 ) - w = TQMAX( w, itm->sizeHint().width() / itm->colSpan() ); + w = TQMAX( w, itm->tqsizeHint().width() / itm->colSpan() ); else - w = TQMAX( w, itm->sizeHint().width() ); + w = TQMAX( w, itm->tqsizeHint().width() ); } } w = TQMAX( w, TQApplication::globalStrut().width() ); @@ -5854,12 +5854,12 @@ void TQTable::adjustRow( int row ) if ( !itm ) { TQWidget *widget = cellWidget( row, i ); if ( widget ) - h = TQMAX( h, widget->sizeHint().height() ); + h = TQMAX( h, widget->tqsizeHint().height() ); } else { if ( itm->rowSpan() > 1 ) - h = TQMAX( h, itm->sizeHint().height() / itm->rowSpan() ); + h = TQMAX( h, itm->tqsizeHint().height() / itm->rowSpan() ); else - h = TQMAX( h, itm->sizeHint().height() ); + h = TQMAX( h, itm->tqsizeHint().height() ); } } h = TQMAX( h, TQApplication::globalStrut().height() ); @@ -6905,11 +6905,11 @@ void TQTableHeader::sectionLabelChanged( int section ) // this does not really belong here if ( orientation() == Qt::Horizontal ) { - int h = sizeHint().height(); + int h = tqsizeHint().height(); if ( h != height() && mayOverwriteMargin(table->topMargin(), h) ) table->setTopMargin( h ); } else { - int w = sizeHint().width(); + int w = tqsizeHint().width(); if ( w != width() && mayOverwriteMargin( ( TQApplication::reverseLayout() ? table->rightMargin() : table->leftMargin() ), w) ) table->setLeftMargin( w ); } diff --git a/experimental/tqtinterface/qt4/src/table/tqtable.h b/experimental/tqtinterface/qt4/src/table/tqtable.h index ec81d44b2..d978ad2ca 100644 --- a/experimental/tqtinterface/qt4/src/table/tqtable.h +++ b/experimental/tqtinterface/qt4/src/table/tqtable.h @@ -143,7 +143,7 @@ public: bool isReplaceable() const; virtual TQString key() const; - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void setSpan( int rs, int cs ); int rowSpan() const; @@ -208,7 +208,7 @@ public: int rtti() const; static int RTTI; - TQSize sizeHint() const; + TQSize tqsizeHint() const; private: TQComboBox *cb; @@ -236,7 +236,7 @@ public: int rtti() const; static int RTTI; - TQSize sizeHint() const; + TQSize tqsizeHint() const; private: TQCheckBox *cb; @@ -341,7 +341,7 @@ public: virtual void paintCell( TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg ); virtual void paintFocus( TQPainter *p, const TQRect &r ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool isReadOnly() const; bool isRowReadOnly( int row ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp index f0f06bc90..c667fecf3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqbutton.cpp @@ -213,7 +213,7 @@ TQTimer *TQButton::timer() To subclass TQButton, you must reimplement at least drawButton() (to draw the button's outline) and drawButtonLabel() (to draw its 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). To reduce flickering, TQButton::paintEvent() sets up a pixmap that diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp index 0b139bf95..37e8eac97 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.cpp @@ -170,16 +170,16 @@ bool TQCheckBox::isTristate() const /*!\reimp */ -TQSize TQCheckBox::sizeHint() const +TQSize TQCheckBox::tqsizeHint() const { - // NB: TQRadioButton::sizeHint() is similar + // NB: TQRadioButton::tqsizeHint() is similar constPolish(); TQPainter p(this); TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - return (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, sz). + return (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, sz). expandedTo(TQApplication::globalStrut())); } @@ -316,7 +316,7 @@ void TQCheckBox::resizeEvent( TQResizeEvent *e ) TQPainter p(this); TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, isz). + TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, isz). expandedTo(TQApplication::globalStrut())); update(wsz.width(), isz.width(), 0, wsz.height()); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h index 0e06a1a50..3f0e21bc0 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqcheckbox.h @@ -66,7 +66,7 @@ public: void setTristate(bool y=TRUE); bool isTristate() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; public Q_SLOTS: void setChecked( bool check ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp index cf28437af..d152da234 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.cpp @@ -367,13 +367,13 @@ public: TQComboBoxPopupItem(TQListBoxItem *i) : TQCustomMenuItem(), li(i), sc(0, 0) { } virtual bool fullSpan() const { return TRUE; } 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, bool, int x, int y, int, int) { 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); p->restore(); } @@ -419,7 +419,7 @@ public: TQLineEdit * ed; // /bin/ed rules! TQTimer *completionTimer; - TQSize sizeHint; + TQSize tqsizeHint; private: bool usingLBox; @@ -1077,10 +1077,10 @@ void TQComboBox::setAutoResize( bool enable ) the contents change dynamically. To tqinvalidate the cached value call setFont(). */ -TQSize TQComboBox::sizeHint() const +TQSize TQComboBox::tqsizeHint() const { - if ( isVisible() && d->sizeHint.isValid() ) - return d->sizeHint; + if ( isVisible() && d->tqsizeHint.isValid() ) + return d->tqsizeHint; constPolish(); int i, w; @@ -1090,7 +1090,7 @@ TQSize TQComboBox::sizeHint() const int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; if ( !d->usingListBox() ) { - w = d->popup()->sizeHint().width() - 2* d->popup()->frameWidth(); + w = d->popup()->tqsizeHint().width() - 2* d->popup()->frameWidth(); if ( w > maxW ) maxW = w; } 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)). 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 ) { - d->sizeHint = TQSize(); // tqinvalidate size hint + d->tqsizeHint = TQSize(); // tqinvalidate size hint TQWidget::setFont( font ); if ( d->usingListBox() ) d->listBox()->setFont( font ); @@ -1519,7 +1519,7 @@ static int listHeight( TQListBox *l, int sl ) if ( l->count() > 0 ) return TQMIN( l->count(), (uint)sl) * l->item( 0 )->height(l); else - return l->sizeHint().height(); + return l->tqsizeHint().height(); } @@ -1569,7 +1569,7 @@ void TQComboBox::popup() lb->triggerUpdate( TRUE ); lb->installEventFilter( this ); 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; TQRect screen = TQApplication::desktop()->availableGeometry( this ); @@ -2204,7 +2204,7 @@ bool TQComboBox::autoCompletion() const */ void TQComboBox::styleChange( TQStyle& s ) { - d->sizeHint = TQSize(); // tqinvalidate size hint... + d->tqsizeHint = TQSize(); // tqinvalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h index b56324094..bfee1920e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqcombobox.h @@ -106,7 +106,7 @@ public: bool autoResize() const; virtual void setAutoResize( bool ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setPalette( const TQPalette & ); void setFont( const TQFont & ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp index acbc092e6..4aaea53ab 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp @@ -1093,7 +1093,7 @@ void TQDateEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize TQDateEdit::sizeHint() const +TQSize TQDateEdit::tqsizeHint() const { constPolish(); TQFontMetrics fm( font() ); @@ -1109,7 +1109,7 @@ TQSize TQDateEdit::sizeHint() const */ TQSize TQDateEdit::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } @@ -2550,7 +2550,7 @@ void TQTimeEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize TQTimeEdit::sizeHint() const +TQSize TQTimeEdit::tqsizeHint() const { constPolish(); TQFontMetrics fm( font() ); @@ -2572,7 +2572,7 @@ TQSize TQTimeEdit::sizeHint() const */ TQSize TQTimeEdit::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } /*! @@ -2694,8 +2694,8 @@ TQDateTimeEdit::~TQDateTimeEdit() void TQDateTimeEdit::resizeEvent( TQResizeEvent * ) { - int dw = de->sizeHint().width(); - int tw = te->sizeHint().width(); + int dw = de->tqsizeHint().width(); + int tw = te->tqsizeHint().width(); int w = width(); int h = height(); int extra = w - ( dw + tw ); @@ -2742,11 +2742,11 @@ void TQDateTimeEdit::init() /*! \reimp */ -TQSize TQDateTimeEdit::sizeHint() const +TQSize TQDateTimeEdit::tqsizeHint() const { constPolish(); - TQSize dsh = de->sizeHint(); - TQSize tsh = te->sizeHint(); + TQSize dsh = de->tqsizeHint(); + TQSize tsh = te->tqsizeHint(); return TQSize( dsh.width() + tsh.width(), TQMAX( dsh.height(), tsh.height() ) ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h index b4a6e938d..ab5935861 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdatetimeedit.h @@ -93,7 +93,7 @@ public: enum Order { DMY, MDY, YMD, YDM }; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: @@ -180,7 +180,7 @@ public: TQTimeEdit( const QTime& time, QWidget* tqparent=0, const char* name=0 ); ~TQTimeEdit(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: @@ -255,7 +255,7 @@ public: const char* name=0 ); ~TQDateTimeEdit(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp index efde0a896..5b9601bcc 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdial.cpp @@ -773,7 +773,7 @@ TQSize TQDial::tqminimumSizeHint() const \reimp */ -TQSize TQDial::sizeHint() const +TQSize TQDial::tqsizeHint() const { return TQSize( 100, 100 ).expandedTo( TQApplication::globalStrut() ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdial.h b/experimental/tqtinterface/qt4/src/widgets/tqdial.h index 3b36e6d63..d7cfcad15 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdial.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdial.h @@ -83,7 +83,7 @@ public: bool notchesVisible() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; int minValue() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp index f70e3bd40..cabc7e878 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp @@ -422,18 +422,18 @@ TQDialogButtons::layoutButtons() } TQSize -TQDialogButtons::sizeHint() const +TQDialogButtons::tqsizeHint() const { constPolish(); TQSize s; if(d->custom) - s = d->custom->sizeHint(); - return (tqstyle().sizeFromContents(TQStyle::CT_DialogButtons, this, s. + s = d->custom->tqsizeHint(); + return (tqstyle().tqsizeFromContents(TQStyle::CT_DialogButtons, this, s. expandedTo(TQApplication::globalStrut()))); } TQSize -TQDialogButtons::sizeHint(TQDialogButtons::Button button) const +TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const { TQWidget *w = NULL; if(d->visible & button) { @@ -445,12 +445,12 @@ TQDialogButtons::sizeHint(TQDialogButtons::Button button) const w = d->buttons[button]; } } - return w->sizeHint(); + return w->tqsizeHint(); } TQSize TQDialogButtons::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h index eed5bbc38..4262ec1fc 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h @@ -85,9 +85,9 @@ public: void setOrientation(Qt::Orientation); Qt::Orientation orientation() const; - virtual TQSize sizeHint(Button) const; + virtual TQSize tqsizeHint(Button) const; TQSize tqminimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void layoutButtons(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp index f9cf2fc99..5aed4893d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp @@ -120,7 +120,7 @@ TQLayoutIterator TQDockAreaLayout::iterator() return 0; } -TQSize TQDockAreaLayout::sizeHint() const +TQSize TQDockAreaLayout::tqsizeHint() const { if ( !dockWindows || !dockWindows->first() ) 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 ) { 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 - 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 ) @@ -226,12 +226,12 @@ static int dock_strut( TQDockWindow *w, Qt::Orientation o ) int wid; if ( ( wid = w->fixedExtent().width() ) != -1 ) 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 { int hei; if ( ( hei = w->fixedExtent().height() ) != -1 ) 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 ) mw = dw->minimumWidth(); else - mw = dw->sizeHint().width(); + mw = dw->tqsizeHint().width(); dockExtend = mw; } else { int mh = 0; if ( !tb ) mh = dw->minimumHeight(); else - mh = dw->sizeHint().height(); + mh = dw->tqsizeHint().height(); dockExtend = mh; } } @@ -886,9 +886,9 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect if ( mse != -10 && w->isResizeEnabled() ) { 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 - w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->sizeHint().height() ) ); + w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->tqsizeHint().height() ) ); } updateLayout(); @@ -1171,13 +1171,13 @@ int TQDockArea::maxSpace( int hint, TQDockWindow *dw ) if ( !tb ) min = TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ); else - min = w->sizeHint().width(); + min = w->tqsizeHint().width(); } else { w->setFixedExtentHeight( -1 ); if ( !tb ) min = TQMAX( w->tqminimumSize().height(), w->tqminimumSizeHint().height() ); else - min = w->sizeHint().height(); + min = w->tqsizeHint().height(); } int diff = hint - ( orientation() == Qt::Horizontal ? dw->width() : dw->height() ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h index 08f700a1f..34c2a50ce 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.h @@ -75,7 +75,7 @@ public: bool hasHeightForWidth() const; int heightForWidth( int ) const; int widthForHeight( int ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQLayoutIterator iterator(); TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::NoDirection; } // [FIXME] Is this redefinition cast to Qt::Orientations correct? diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index 6809828d6..e6e6f558f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -80,7 +80,7 @@ public: void setOrientation( Orientation o ); Orientation orientation() const { return orient; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent( TQPaintEvent * ); @@ -109,10 +109,10 @@ TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *tqp setOrientation( o ); } -TQSize TQDockWindowResizeHandle::sizeHint() const +TQSize TQDockWindowResizeHandle::tqsizeHint() const { 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())); } @@ -320,7 +320,7 @@ public: TQSize tqminimumSizeHint() const; TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize sizeHint() const { return tqminimumSize(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; 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(); bl->setDirection( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ); bl->activate(); - r.setSize( bl->sizeHint() ); + r.setSize( bl->tqsizeHint() ); bl->data = 0; delete bl; bool reverse = TQApplication::reverseLayout(); @@ -1808,9 +1808,9 @@ TQBoxLayout *TQDockWindow::boxLayout() /*! \reimp */ -TQSize TQDockWindow::sizeHint() const +TQSize TQDockWindow::tqsizeHint() const { - TQSize sh( TQFrame::sizeHint() ); + TQSize sh( TQFrame::tqsizeHint() ); if ( place() == InDock ) sh = sh.expandedTo( fixedExtent() ); sh = sh.expandedTo( TQSize( 16, 16 ) ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h index 242d124f7..6906fd972 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.h @@ -133,7 +133,7 @@ public: Orientation orientation() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqminimumSizeHint() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp b/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp index cb8527fcd..0ac6a249b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqeffects.cpp @@ -395,8 +395,8 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient ) totalWidth = widget->width(); totalHeight = widget->height(); } else { - totalWidth = widget->sizeHint().width(); - totalHeight = widget->sizeHint().height(); + totalWidth = widget->tqsizeHint().width(); + totalHeight = widget->tqsizeHint().height(); } currentHeight = totalHeight; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp index 4bce9b114..f49b30c8b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqframe.cpp @@ -476,18 +476,18 @@ TQRect TQFrame::contentsRect() const /*!\reimp */ -TQSize TQFrame::sizeHint() const +TQSize TQFrame::tqsizeHint() const { // Returns a size hint for the frame - for HLine and VLine // 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) { case HLine: return TQSize(-1,3); case VLine: return TQSize(3,-1); default: - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqframe.h b/experimental/tqtinterface/qt4/src/widgets/tqframe.h index bc68c2488..8d289d241 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqframe.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqframe.h @@ -74,7 +74,7 @@ public: bool lineShapesOk() const { return TRUE; } #endif - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; enum Shape { NoFrame = 0, // no frame Box = 0x0001, // rectangular box diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp index 68bbc6cb3..06c6a88b8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgrid.cpp @@ -52,7 +52,7 @@ The number of rows \e or columns is defined in the constructor. 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 setSpacing() to add space between the widgets. @@ -128,10 +128,10 @@ void TQGrid::frameChanged() \reimp */ -TQSize TQGrid::sizeHint() const +TQSize TQGrid::tqsizeHint() const { TQWidget *mThis = (TQWidget*)this; TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); - return TQFrame::sizeHint(); + return TQFrame::tqsizeHint(); } #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgrid.h b/experimental/tqtinterface/qt4/src/widgets/tqgrid.h index 84891364f..98ee82619 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgrid.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqgrid.h @@ -55,7 +55,7 @@ public: WFlags f = 0 ); void setSpacing( int ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; #ifndef TQT_NO_COMPAT typedef Qt::Orientation Direction; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index fd07192b0..f9c341e9e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -213,8 +213,8 @@ void TQGroupBox::setTextSpacer() int fh = fm.height(); if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - fh = d->checkbox->sizeHint().height() + 2; - w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); + fh = d->checkbox->tqsizeHint().height() + 2; + w = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); #endif } else { fh = fm.height(); @@ -766,14 +766,14 @@ void TQGroupBox::fontChange( const TQFont & oldFont ) \reimp */ -TQSize TQGroupBox::sizeHint() const +TQSize TQGroupBox::tqsizeHint() const { TQFontMetrics fm( font() ); int tw, th; if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); - th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') ); + tw = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); + th = d->checkbox->tqsizeHint().height() + fm.width( TQChar(' ') ); #endif } else { tw = fm.width( title() ) + 2 * fm.width( "xx" ); @@ -782,7 +782,7 @@ TQSize TQGroupBox::sizeHint() const TQSize s; if ( tqlayout() ) { - s = TQFrame::sizeHint(); + s = TQFrame::tqsizeHint(); return s.expandedTo( TQSize( tw, 0 ) ); } else { TQRect r = tqchildrenRect(); @@ -960,7 +960,7 @@ void TQGroupBox::setEnabled(bool on) void TQGroupBox::updateCheckBoxGeometry() { if ( d->checkbox ) { - TQSize cbSize = d->checkbox->sizeHint(); + TQSize cbSize = d->checkbox->tqsizeHint(); TQRect cbRect( 0, 0, cbSize.width(), cbSize.height() ); int marg = bFlat ? 2 : 8; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h index 3737ad7e9..d73403ef6 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqgroupbox.h @@ -99,7 +99,7 @@ public: void setInsideSpacing( int s ); void addSpace( int ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool isFlat() const; void setFlat( bool b ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp index 2f333100c..d25956d8a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbox.cpp @@ -51,7 +51,7 @@ \ingroup appearance 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 setSpacing() to add space between the widgets. Use @@ -123,11 +123,11 @@ void TQHBox::setSpacing( int space ) \reimp */ -TQSize TQHBox::sizeHint() const +TQSize TQHBox::tqsizeHint() const { TQWidget *mThis = (TQWidget*)this; TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); - return TQFrame::sizeHint(); + return TQFrame::tqsizeHint(); } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqhbox.h b/experimental/tqtinterface/qt4/src/widgets/tqhbox.h index c67638b79..e669eb0fc 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqhbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqhbox.h @@ -57,7 +57,7 @@ public: void setSpacing( int ); bool setStretchFactor( TQWidget*, int stretch ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: TQHBox( bool horizontal, TQWidget* tqparent, const char* name, WFlags f = 0 ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp index bc49be313..67fb7f0a4 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.cpp @@ -1224,7 +1224,7 @@ void TQHeader::setIsATableHeader( bool b ) } /*! \reimp */ -TQSize TQHeader::sizeHint() const +TQSize TQHeader::tqsizeHint() const { int width; int height; @@ -1255,7 +1255,7 @@ TQSize TQHeader::sizeHint() const for ( int i = 0; i < count(); 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())); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqheader.h b/experimental/tqtinterface/qt4/src/widgets/tqheader.h index 9456a2bdb..ab0f3716e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqheader.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqheader.h @@ -112,7 +112,7 @@ public: int offset() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; int mapToSection( int index ) const; int mapToIndex( int section ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp index 0b529f0be..b29d5999f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp @@ -272,7 +272,7 @@ void TQLabel::setText( const TQString &text ) { if ( ltext == text ) return; - TQSize osh = sizeHint(); + TQSize osh = tqsizeHint(); #ifndef TQT_NO_RICHTEXT bool hadRichtext = doc != 0; #endif @@ -338,7 +338,7 @@ void TQLabel::clear() */ void TQLabel::setPixmap( const TQPixmap &pixmap ) { - TQSize osh = sizeHint(); + TQSize osh = tqsizeHint(); if ( !lpixmap || lpixmap->serialNumber() != pixmap.serialNumber() ) { clearContents(); @@ -363,7 +363,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap ) void TQLabel::setPicture( const TQPicture &picture ) { - TQSize osh = sizeHint(); + TQSize osh = tqsizeHint(); clearContents(); lpicture = new TQPicture( picture ); @@ -439,7 +439,7 @@ void TQLabel::tqsetAlignment( int tqalignment ) { if ( tqalignment == align ) return; - TQSize osh = sizeHint(); + TQSize osh = tqsizeHint(); #ifndef TQT_NO_ACCEL if ( lbuddy ) align = tqalignment | TQt::ShowPrefix; @@ -508,7 +508,7 @@ void TQLabel::setIndent( int indent ) Auto-resizing is disabled by default. - \sa autoResize(), adjustSize(), sizeHint() + \sa autoResize(), adjustSize(), tqsizeHint() */ 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 - 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 @@ -620,7 +620,7 @@ int TQLabel::heightForWidth( int w ) const /*!\reimp */ -TQSize TQLabel::sizeHint() const +TQSize TQLabel::tqsizeHint() const { if ( d->valid_hints != frameWidth() ) (void) TQLabel::tqminimumSizeHint(); @@ -654,9 +654,9 @@ TQSize TQLabel::tqminimumSizeHint() const if ( d->sh.height() < sz.height() ) sz.rheight() = d->sh.height(); } - if ( sizePolicy().horData() == TQSizePolicy::Ignored ) + if ( tqsizePolicy().horData() == TQSizePolicy::Ignored ) sz.rwidth() = -1; - if ( sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( tqsizePolicy().verData() == TQSizePolicy::Ignored ) sz.rheight() = -1; d->msh = sz; return sz; @@ -854,12 +854,12 @@ void TQLabel::drawContents( TQPainter *p ) void TQLabel::updateLabel( TQSize oldSizeHint ) { d->valid_hints = -1; - TQSizePolicy policy = sizePolicy(); + TQSizePolicy policy = tqsizePolicy(); bool wordBreak = align & TQt::WordBreak; policy.setHeightForWidth( wordBreak ); - if ( policy != sizePolicy() ) + if ( policy != tqsizePolicy() ) tqsetSizePolicy( policy ); - if ( sizeHint() != oldSizeHint ) + if ( tqsizeHint() != oldSizeHint ) updateGeometry(); if ( autoresize ) { adjustSize(); @@ -1026,7 +1026,7 @@ void TQLabel::movieResized( const TQSize& size ) void TQLabel::setMovie( const TQMovie& movie ) { - TQSize osh = sizeHint(); + TQSize osh = tqsizeHint(); clearContents(); lmovie = new TQMovie( movie ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.h b/experimental/tqtinterface/qt4/src/widgets/tqlabel.h index cd0bba7b6..654648ecf 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.h @@ -95,7 +95,7 @@ public: bool hasScaledContents() const; void setScaledContents( bool ); #endif - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; #ifndef TQT_NO_ACCEL virtual void setBuddy( TQWidget * ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp index c20f6ce93..16f225b41 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp @@ -1162,7 +1162,7 @@ TQLCDNumber::SegmentStyle TQLCDNumber::segmentStyle() const /*!\reimp */ -TQSize TQLCDNumber::sizeHint() const +TQSize TQLCDNumber::tqsizeHint() const { return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h index 0ae3b26a4..e9543056a 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlcdnumber.h @@ -89,7 +89,7 @@ public: double value() const; int intValue() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; public Q_SLOTS: void display( const TQString &str ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp index c7b08ef84..2d4115231 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.cpp @@ -640,14 +640,14 @@ void TQLineEdit::setValidator( const TQValidator *v ) 20 characters. */ -TQSize TQLineEdit::sizeHint() const +TQSize TQLineEdit::tqsizeHint() const { constPolish(); TQFontMetrics fm( font() ); int h = TQMAX(fm.lineSpacing(), 14) + 2*innerMargin; int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; - return (tqstyle().sizeFromContents(TQStyle::CT_LineEdit, this, + return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this, TQSize( w + m, h + m ). expandedTo(TQApplication::globalStrut()))); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h index 9791e0b8a..a8c3242a3 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlineedit.h @@ -102,7 +102,7 @@ public: const TQValidator * validator() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; int cursorPosition() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp index b785f06bc..b829780e0 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.cpp @@ -3074,7 +3074,7 @@ void TQListBox::emitChangedSignal( bool ) /*! \reimp */ -TQSize TQListBox::sizeHint() const +TQSize TQListBox::tqsizeHint() const { if ( cachedSizeHint().isValid() ) return cachedSizeHint(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h index 22447eb2d..936c69a56 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistbox.h @@ -136,7 +136,7 @@ public: bool isSelected( const TQListBoxItem * ) const; TQListBoxItem* selectedItem() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; TQListBoxItem *item( int index ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp index 655859f4e..bd706e917 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.cpp @@ -3249,7 +3249,7 @@ void TQListView::clear() delete c; c = n; } - resizeContents( d->h->sizeHint().width(), contentsHeight() ); + resizeContents( d->h->tqsizeHint().width(), contentsHeight() ); delete d->r; d->r = 0; TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); @@ -3640,7 +3640,7 @@ void TQListView::updateGeometries() if ( d->h->isHidden() ) { setMargins( 0, 0, 0, 0 ); } else { - TQSize hs( d->h->sizeHint() ); + TQSize hs( d->h->tqsizeHint() ); setMargins( 0, hs.height(), 0, 0 ); d->h->setGeometry( viewport()->x(), viewport()->y()-hs.height(), visibleWidth(), hs.height() ); @@ -6844,7 +6844,7 @@ void TQCheckListItem::paintFocus( TQPainter *p, const TQColorGroup & cg, /*! \reimp */ -TQSize TQListView::sizeHint() const +TQSize TQListView::tqsizeHint() const { if ( cachedSizeHint().isValid() ) return cachedSizeHint(); @@ -6855,7 +6855,7 @@ TQSize TQListView::sizeHint() const // force the column widths to sanity, if possible buildDrawableList(); - TQSize s( d->h->sizeHint() ); + TQSize s( d->h->tqsizeHint() ); if ( verticalScrollBar()->isVisible() ) s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h index a61419b56..11d2110b8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqlistview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqlistview.h @@ -341,7 +341,7 @@ public: virtual bool eventFilter( TQObject * o, TQEvent * ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; virtual void setShowSortIndicator( bool show ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index e05de633e..1921297c2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -140,7 +140,7 @@ public: void setRightDock( TQDockArea *r ); void setCentralWidget( TQWidget *w ); bool hasHeightForWidth() const { return FALSE; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQLayoutIterator iterator(); TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::BothDirections; } @@ -189,23 +189,23 @@ TQLayoutItem* TQMainWindowLayout::takeAt(int index) { return 0; } -TQSize TQMainWindowLayout::sizeHint() const +TQSize TQMainWindowLayout::tqsizeHint() const { int w = 0; int h = 0; if ( left ) { - w += left->sizeHint().width(); - h = TQMAX( h, left->sizeHint().height() ); + w += left->tqsizeHint().width(); + h = TQMAX( h, left->tqsizeHint().height() ); } if ( right ) { - w += right->sizeHint().width(); - h = TQMAX( h, right->sizeHint().height() ); + w += right->tqsizeHint().width(); + h = TQMAX( h, right->tqsizeHint().height() ); } if ( central ) { - w += central->sizeHint().width(); + w += central->tqsizeHint().width(); int diff = extraPixels(); - h = TQMAX( h, central->sizeHint().height() + diff ); + h = TQMAX( h, central->tqsizeHint().height() + diff ); } return TQSize( w, h ); @@ -1566,7 +1566,7 @@ void TQMainWindow::hide() /*! \reimp */ -TQSize TQMainWindow::sizeHint() const +TQSize TQMainWindow::tqsizeHint() const { TQMainWindow* that = (TQMainWindow*) this; // Workaround: because d->tll get's deleted in diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h index c376b4476..6cbcc02ac 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmainwindow.h @@ -98,7 +98,7 @@ public: void show(); void hide(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; bool rightJustification() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp index a0751f4c5..aadb3ee79 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -734,17 +734,17 @@ void TQMenuBar::openActPopup() TQPoint pos = r.bottomLeft() + TQPoint(0,yoffset); if( reverse ) { 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); int sh = TQApplication::desktop()->height(); if ( defaultup || (pos.y() + ph > sh) ) { TQPoint t = mapToGlobal( r.topLeft() ); if( reverse ) { t = mapToGlobal( r.topRight() ); - t.rx() -= popup->sizeHint().width(); + t.rx() -= popup->tqsizeHint().width(); } t.ry() -= (TQCOORD)ph; if ( !defaultup || t.y() >= 0 ) @@ -940,8 +940,8 @@ int TQMenuBar::calculateRects( int max_width ) if ( mi->widget()->parentWidget() != this ) { mi->widget()->reparent( this, TQPoint(0,0) ); } - w = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; - h = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; + w = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; + h = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; if ( i && separator < 0 ) separator = i; } else if ( mi->pixmap() ) { // pixmap item @@ -1031,7 +1031,7 @@ int TQMenuBar::calculateRects( int max_width ) irects[i].setHeight( max_item_height ); TQMenuItem *mi = mitems->at(i); if ( mi->widget() ) { - TQRect r ( TQPoint(0,0), mi->widget()->sizeHint() ); + TQRect r ( TQPoint(0,0), mi->widget()->tqsizeHint() ); r.moveCenter( irects[i].center() ); mi->widget()->setGeometry( r ); if( mi->widget()->isHidden() ) @@ -1598,7 +1598,7 @@ void TQMenuBar::focusOutEvent( TQFocusEvent * ) \reimp */ -TQSize TQMenuBar::sizeHint() const +TQSize TQMenuBar::tqsizeHint() const { int h = height(); if ( badSize ) @@ -1609,7 +1609,7 @@ TQSize TQMenuBar::sizeHint() const s.setWidth( s.width() + irects[ i ].width() + 2 ); } s.setHeight( h ); - return (tqstyle().sizeFromContents(TQStyle::CT_MenuBar, this, s. + return (tqstyle().tqsizeFromContents(TQStyle::CT_MenuBar, this, s. expandedTo(TQApplication::globalStrut()))); } @@ -1622,7 +1622,7 @@ TQSize TQMenuBar::tqminimumSize() const #ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent()); if ( tb ) - return sizeHint(); + return tqsizeHint(); #endif return TQFrame::tqminimumSize(); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h index 618b8ed08..6b320319f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenubar.h @@ -81,7 +81,7 @@ public: bool customWhatsThis() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqminimumSizeHint() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp index cb2932f6c..2f0fd808d 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.cpp @@ -1471,7 +1471,7 @@ TQString TQMenuData::whatsThis( int id ) const \ingroup misc 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 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. */ diff --git a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h index 95fb7eb99..96128c063 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqmenudata.h @@ -133,7 +133,7 @@ public: virtual void setFont( const TQFont& font ); virtual void paint( TQPainter* p, const TQColorGroup& cg, bool act, bool enabled, int x, int y, int w, int h ) = 0; - virtual TQSize sizeHint() = 0; + virtual TQSize tqsizeHint() = 0; }; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index d9a9f581d..bbfdb60c2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -483,7 +483,7 @@ void TQPopupMenu::frameChanged() you cannot rely on the popup menu's current size(). For performance reasons, the popup adapts its size only when 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. */ @@ -613,7 +613,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) register TQMenuItem *mi = NULL; TQMenuItemListIt it(*mitems); 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 )), TQStyleOption(mi,maxPMWidth,0)); tmp_y += sz.height(); @@ -940,7 +940,7 @@ int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const } int itemh = itemHeight( mi ); - sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); @@ -999,7 +999,7 @@ TQRect TQPopupMenu::itemGeometry( int index ) } int itemh = itemHeight( mi ); - sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); 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 ); if ( mi->widget() ) { - TQSize s( mi->widget()->sizeHint() ); + TQSize s( mi->widget()->tqsizeHint() ); s = s.expandedTo( mi->widget()->tqminimumSize() ); mi->widget()->resize( s ); if ( s.width() > maxWidgetWidth ) @@ -1097,9 +1097,9 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) if ( mi->custom() ) { if ( mi->custom()->fullSpan() ) { maxWidgetWidth = TQMAX( maxWidgetWidth, - mi->custom()->sizeHint().width() ); + mi->custom()->tqsizeHint().width() ); } else { - TQSize s ( mi->custom()->sizeHint() ); + TQSize s ( mi->custom()->tqsizeHint() ); w += s.width(); } } @@ -1125,14 +1125,14 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) w += mi->pixmap()->width(); } else { if ( mi->custom() ) { - TQSize s ( mi->custom()->sizeHint() ); + TQSize s ( mi->custom()->tqsizeHint() ); w += s.width(); } else { w = itemHeight = 2; } } - TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(w, itemHeight), TQStyleOption(mi,maxPMWidth)); @@ -1202,7 +1202,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) int itemh = itemHeight( mi ); - sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); itemw = sz.width(); @@ -1439,7 +1439,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const if ( mi->widget() ) return mi->widget()->height(); if ( mi->custom() && mi->custom()->fullSpan() ) - return mi->custom()->sizeHint().height(); + return mi->custom()->tqsizeHint().height(); TQFontMetrics fm(fontMetrics()); int h = 0; @@ -1454,7 +1454,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const h = TQMAX(h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height()); if ( mi->custom() ) - h = TQMAX(h, mi->custom()->sizeHint().height()); + h = TQMAX(h, mi->custom()->tqsizeHint().height()); return h; } @@ -1536,7 +1536,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) continue; } int itemh = itemHeight( mi ); - sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), 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) { if(i >= d->scroll.topScrollableIndex) { int itemh = itemHeight(it.current()); - TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(it.current(),maxPMWidth,0)); y += sz.height(); @@ -2235,7 +2235,7 @@ void TQPopupMenu::enabledChange( bool ) This functions returns the number of columns necessary. - \sa sizeHint() + \sa tqsizeHint() */ int TQPopupMenu::columns() const { @@ -2278,7 +2278,7 @@ void TQPopupMenu::subScrollTimer() { for(int i = 0, y = contentsRect().y() + sh; it.current(); i++, ++it) { if(i >= d->scroll.topScrollableIndex) { 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)); y += sz.height(); if(y > contentsRect().height() - sh) { @@ -2328,7 +2328,7 @@ void TQPopupMenu::subMenuTimer() { TQRect r( itemGeometry( actItem ) ); TQPoint p; - TQSize ps = popup->sizeHint(); + TQSize ps = popup->tqsizeHint(); if( TQApplication::reverseLayout() ) { p = TQPoint( r.left() + motifArrowHMargin - ps.width(), r.top() + motifArrowVMargin ); p = mapToGlobal( p ); @@ -2440,10 +2440,10 @@ void TQPopupMenu::updateRow( int row ) you cannot rely on the popup menu's current size(). For performance reasons, the popup adapts its size only when 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. - \sa popup(), sizeHint() + \sa popup(), tqsizeHint() */ int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint ) @@ -2564,11 +2564,11 @@ void TQPopupMenu::setActiveItem( int i ) /*! \reimp */ -TQSize TQPopupMenu::sizeHint() const +TQSize TQPopupMenu::tqsizeHint() const { constPolish(); 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() ); } @@ -2674,7 +2674,7 @@ public: return TRUE; } - TQSize sizeHint() + TQSize tqsizeHint() { return TQSize( 20, 6 ); } @@ -2834,7 +2834,7 @@ TQPopupMenu::updateScrollerState() while ( (mi=it.current()) ) { ++it; int myheight = contentsRect().height(); - TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemHeight( mi )), TQStyleOption(mi,maxPMWidth)); if(y + sz.height() >= myheight) { diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h index 34b208b0f..0dd00b55e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqpopupmenu.h @@ -72,7 +72,7 @@ public: int exec( const TQPoint & pos, int indexAtPoint = 0 ); // modal virtual void setActiveItem( int ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; int idAt( int index ) const { return TQMenuData::idAt( index ); } int idAt( const TQPoint& pos ) const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp index 8c6e8ca19..e00d12d94 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.cpp @@ -229,12 +229,12 @@ void TQProgressBar::setProgress( int progress, int totalSteps ) /*! \reimp */ -TQSize TQProgressBar::sizeHint() const +TQSize TQProgressBar::tqsizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); 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, fm.height() + 8)); } @@ -245,7 +245,7 @@ TQSize TQProgressBar::sizeHint() const */ TQSize TQProgressBar::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h index 93f484ed7..7b9d19105 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqprogressbar.h @@ -70,7 +70,7 @@ public: int progress() const; const TQString &progressString() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void setCenterIndicator( bool on ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp index d1047b45d..e8583ff00 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp @@ -402,7 +402,7 @@ void TQPushButton::setDefault( bool enable ) /*! \reimp */ -TQSize TQPushButton::sizeHint() const +TQSize TQPushButton::tqsizeHint() const { constPolish(); @@ -437,7 +437,7 @@ TQSize TQPushButton::sizeHint() const 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())); } @@ -712,24 +712,24 @@ void TQPushButton::popupPressed() #endif if ( horizontal ) { 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() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->sizeHint().height() ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->tqsizeHint().height() ) ) ); } else { - TQSize sz( popup->sizeHint() ); + TQSize sz( popup->tqsizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.ry() -= sz.height(); popup->exec( p ); } } else { 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() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->sizeHint().width(), 0 ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->tqsizeHint().width(), 0 ) ) ); } else { - TQSize sz( popup->sizeHint() ); + TQSize sz( popup->tqsizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.rx() -= sz.width(); popup->exec( p ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h index 6cbcb05a5..92a375dc7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.h @@ -72,7 +72,7 @@ public: #endif ~TQPushButton(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void move( int x, int y ); void move( const TQPoint &p ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp index 0ddddf80e..69bdedba8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.cpp @@ -156,17 +156,17 @@ void TQRadioButton::setChecked( bool check ) /*! \reimp */ -TQSize TQRadioButton::sizeHint() const +TQSize TQRadioButton::tqsizeHint() const { // Any more complex, and we will use tqstyle().tqitemRect() - // NB: TQCheckBox::sizeHint() is similar + // NB: TQCheckBox::tqsizeHint() is similar constPolish(); TQPainter p(this); TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - return (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, sz). + return (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, sz). expandedTo(TQApplication::globalStrut())); } @@ -321,7 +321,7 @@ void TQRadioButton::resizeEvent( TQResizeEvent* e ) TQPainter p(this); TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, isz). + TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, isz). expandedTo(TQApplication::globalStrut())); update(wsz.width(), isz.width(), 0, wsz.height()); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h index e49600680..50f9927b2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqradiobutton.h @@ -60,7 +60,7 @@ public: bool isChecked() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; public Q_SLOTS: virtual void setChecked( bool check ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp index af9ab5672..09d1575f7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.cpp @@ -319,7 +319,7 @@ void TQScrollBar::setOrientation( Qt::Orientation orientation ) if ( orientation == orient ) return; if ( !testWState( TQt::WState_OwnSizePolicy ) ) { - TQSizePolicy sp = sizePolicy(); + TQSizePolicy sp = tqsizePolicy(); sp.transpose(); tqsetSizePolicy( sp ); clearWState( TQt::WState_OwnSizePolicy ); @@ -371,7 +371,7 @@ void TQScrollBar::setPalette( const TQPalette &p ) /*! \reimp */ -TQSize TQScrollBar::sizeHint() const +TQSize TQScrollBar::tqsizeHint() const { constPolish(); int sbextent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h index 44d47e1ee..cf48a0544 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollbar.h @@ -77,7 +77,7 @@ public: bool draggingSlider() const; virtual void setPalette( const TQPalette & ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void tqsetSizePolicy( TQSizePolicy sp ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp index 1c4318099..49c5b4d9b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.cpp @@ -176,7 +176,7 @@ public: bool anyVisibleChildren(); void autoMove(TQScrollView* sv); void autoResize(TQScrollView* sv); - void autoResizeHint(TQScrollView* sv); + void autoRetqsizeHint(TQScrollView* sv); void viewportResized( int w, int h ); 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 ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize s = r->child->sizeHint(); + TQSize s = r->child->tqsizeHint(); if ( s.isValid() ) r->child->resize(s); } } else if ( policy == TQScrollView::AutoOneFit ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize sh = r->child->sizeHint(); + TQSize sh = r->child->tqsizeHint(); sh = sh.boundedTo( r->child->tqmaximumSize() ); sv->resizeContents( sh.width(), sh.height() ); } @@ -338,7 +338,7 @@ void TQScrollViewData::viewportResized( int w, int h ) if ( policy == TQScrollView::AutoOneFit ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize sh = r->child->sizeHint(); + TQSize sh = r->child->tqsizeHint(); sh = sh.boundedTo( r->child->tqmaximumSize() ); 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. \value AutoOneFit if there is only one child widget the contents stays - the size of that widget's sizeHint(). If the scrollview is resized - larger than the child's sizeHint(), the child will be resized to + the size of that widget's tqsizeHint(). If the scrollview is resized + larger than the child's tqsizeHint(), the child will be resized to 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 /*! @@ -794,8 +794,8 @@ TQSize TQScrollView::viewportSize( int x, int y ) const bool needh, needv; bool showh, showv; - int hsbExt = horizontalScrollBar()->sizeHint().height(); - int vsbExt = verticalScrollBar()->sizeHint().width(); + int hsbExt = horizontalScrollBar()->tqsizeHint().height(); + int vsbExt = verticalScrollBar()->tqsizeHint().width(); if ( d->policy != AutoOne || d->anyVisibleChildren() ) { // Do we definitely need the scrollbar? @@ -865,8 +865,8 @@ void TQScrollView::updateScrollBars() bool showv; bool showc = FALSE; - int hsbExt = horizontalScrollBar()->sizeHint().height(); - int vsbExt = verticalScrollBar()->sizeHint().width(); + int hsbExt = horizontalScrollBar()->tqsizeHint().height(); + int vsbExt = verticalScrollBar()->tqsizeHint().width(); TQSize oldVisibleSize( visibleWidth(), visibleHeight() ); @@ -1401,7 +1401,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y) if (r) { r->moveTo(this,x,y,d->clipped_viewport); if ( d->policy > Manual ) { - d->autoResizeHint(this); + d->autoRetqsizeHint(this); d->autoResize(this); // #### better to just deal with this one widget! } return; @@ -1422,7 +1422,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y) d->addChildRec(child,x,y)->hideOrShow(this, d->clipped_viewport); if ( d->policy > Manual ) { - d->autoResizeHint(this); + d->autoRetqsizeHint(this); 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()); break; case TQEvent::LayoutHint: - d->autoResizeHint(this); + d->autoRetqsizeHint(this); break; default: break; @@ -2688,7 +2688,7 @@ void TQScrollView::viewportToContents( int vx, int vy, int& x, int& y ) const /*! \reimp */ -TQSize TQScrollView::sizeHint() const +TQSize TQScrollView::tqsizeHint() const { if ( d->use_cached_size_hint && d->cachedSizeHint.isValid() ) return d->cachedSizeHint; @@ -2700,7 +2700,7 @@ TQSize TQScrollView::sizeHint() const if ( d->policy > Manual ) { TQSVChildRec *r = d->tqchildren.first(); if ( r ) { - TQSize cs = r->child->sizeHint(); + TQSize cs = r->child->tqsizeHint(); if ( cs.isValid() ) sz += cs.boundedTo( r->child->tqmaximumSize() ); else @@ -2710,9 +2710,9 @@ TQSize TQScrollView::sizeHint() const sz += TQSize( d->contentsWidth(), contentsHeight() ); } if (d->vMode == AlwaysOn) - sz.setWidth(sz.width() + d->vbar->sizeHint().width()); + sz.setWidth(sz.width() + d->vbar->tqsizeHint().width()); 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) ) .boundedTo( TQSize(36 * h, 24 * h) ); } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h index f881c0ec7..caa86bbfd 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqscrollview.h @@ -135,7 +135,7 @@ public: bool hasStaticBackground() const; TQSize viewportSize( int, int ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void removeChild(TQObject* child); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp index d8a3ffa2d..9d3ece2fd 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqslider.cpp @@ -729,7 +729,7 @@ int TQSlider::goodPart( const TQPoint &p ) const /*! \reimp */ -TQSize TQSlider::sizeHint() const +TQSize TQSlider::tqsizeHint() const { constPolish(); const int length = 84, tickSpace = 5; @@ -743,7 +743,7 @@ TQSize TQSlider::sizeHint() const w = length; h = thick; } - return (tqstyle().sizeFromContents(TQStyle::CT_Slider, this, + return (tqstyle().tqsizeFromContents(TQStyle::CT_Slider, this, TQSize(w, h)).expandedTo(TQApplication::globalStrut())); } @@ -755,7 +755,7 @@ TQSize TQSlider::sizeHint() const TQSize TQSlider::tqminimumSizeHint() const { - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); int length = tqstyle().tqpixelMetric(TQStyle::PM_SliderLength, this); if ( orient == Qt::Horizontal ) s.setWidth( length ); @@ -780,7 +780,7 @@ void TQSlider::tqsetSizePolicy( TQSizePolicy sp ) TQSizePolicy TQSlider::sizePolicy() const { // ### 4.0 remove this reimplementation - return TQWidget::sizePolicy(); + return TQWidget::tqsizePolicy(); } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqslider.h b/experimental/tqtinterface/qt4/src/widgets/tqslider.h index a759782e8..ac6177d4e 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqslider.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqslider.h @@ -85,7 +85,7 @@ public: int sliderStart() const; TQRect sliderRect() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; void tqsetSizePolicy( TQSizePolicy sp ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp index f284d2c73..579d93b57 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.cpp @@ -496,10 +496,10 @@ bool TQSpinBox::wrapping() const /*! \reimp */ -TQSize TQSpinBox::sizeHint() const +TQSize TQSpinBox::tqsizeHint() const { constPolish(); - TQSize sz = vi->sizeHint(); + TQSize sz = vi->tqsizeHint(); int h = sz.height(); TQFontMetrics fm( font() ); int w = 35; @@ -513,7 +513,7 @@ TQSize TQSpinBox::sizeHint() const s = specialValueText(); 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(), h + tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) * 2). expandedTo( TQApplication::globalStrut() )); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h index 2be3150a3..2e18cef28 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqspinbox.h @@ -94,7 +94,7 @@ public: virtual void setValidator( const TQValidator* v ); const TQValidator * validator() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; int minValue() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp index 78b9f9050..2750a4591 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.cpp @@ -63,7 +63,7 @@ public: bool opaque() const { return s->opaqueResize(); } - TQSize sizeHint() const; + TQSize tqsizeHint() const; int id() const { return myId; } // d->list.at(id())->wid == this void setId( int i ) { myId = i; } @@ -126,10 +126,10 @@ TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent, setOrientation( o ); } -TQSize TQSplitterHandle::sizeHint() const +TQSize TQSplitterHandle::tqsizeHint() const { int hw = s->handleWidth(); - return parentWidget()->tqstyle().sizeFromContents( TQStyle::CT_Splitter, s, + return parentWidget()->tqstyle().tqsizeFromContents( TQStyle::CT_Splitter, s, TQSize(hw, hw) ) .expandedTo( TQApplication::globalStrut() ); } @@ -197,7 +197,7 @@ public: TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient ) { if ( sizer == -1 ) { - TQSize s = wid->sizeHint(); + TQSize s = wid->tqsizeHint(); if ( !s.isValid() || wid->testWState(WState_Resized) ) s = wid->size(); sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height(); @@ -339,7 +339,7 @@ void TQSplitter::setOrientation( Qt::Orientation o ) return; if ( !testWState( TQt::WState_OwnSizePolicy ) ) { - TQSizePolicy sp = sizePolicy(); + TQSizePolicy sp = tqsizePolicy(); sp.transpose(); tqsetSizePolicy( sp ); clearWState( TQt::WState_OwnSizePolicy ); @@ -435,7 +435,7 @@ TQSplitterLayoutStruct *TQSplitter::addWidget( TQWidget *w, bool prepend ) s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->sizeHint() ); + s->sizer = pick( newHandle->tqsizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -852,14 +852,14 @@ void TQSplitter::doResize() if ( s->wid->isHidden() || isCollapsed(s->wid) ) { a[i].tqmaximumSize = 0; } 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; } else { int mode = s->resizeMode; int stretch = 1; if ( mode == DefaultResizeMode ) { - TQSizePolicy p = s->wid->sizePolicy(); + TQSizePolicy p = s->wid->tqsizePolicy(); int sizePolicyStretch = pick( TQSize(p.horStretch(), p.verStretch()) ); if ( sizePolicyStretch > 0 ) { @@ -890,11 +890,11 @@ void TQSplitter::doResize() stretch *= s->getSizer( orient ); // TQMIN(): ad hoc work-around for tqlayout engine limitation a[i].stretch = TQMIN( stretch, 8192 ); - a[i].sizeHint = a[i].tqminimumSize; + a[i].tqsizeHint = a[i].tqminimumSize; } else if ( mode == KeepSize ) { - a[i].sizeHint = s->getSizer( orient ); + a[i].tqsizeHint = s->getSizer( orient ); } 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 */ -TQSize TQSplitter::sizeHint() const +TQSize TQSplitter::tqsizeHint() const { constPolish(); int l = 0; @@ -1121,7 +1121,7 @@ TQSize TQSplitter::sizeHint() const while( (o = it.current()) != 0 ) { ++it; if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { - TQSize s = ((TQWidget*)o)->sizeHint(); + TQSize s = ((TQWidget*)o)->tqsizeHint(); if ( s.isValid() ) { l += pick( s ); t = TQMAX( t, trans( s ) ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h index 3fc1f487b..b9d536df7 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqsplitter.h @@ -87,7 +87,7 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; TQValueList<int> sizes() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp index 75bbee874..6dbe4a44b 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqstatusbar.cpp @@ -47,7 +47,7 @@ #include "tqtimer.h" #include "tqdrawutil.h" #include "tqstyle.h" -#include "sizegrip.h" +#include "tqsizegrip.h" /*! \class TQStatusBar tqstatusbar.h @@ -312,7 +312,7 @@ void TQStatusBar::reformat() TQStatusBarPrivate::SBItem* item = d->items.first(); while ( item && !item->p ) { l->addWidget( item->w, item->s ); - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -322,7 +322,7 @@ void TQStatusBar::reformat() while ( item ) { l->addWidget( item->w, item->s ); - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -330,7 +330,7 @@ void TQStatusBar::reformat() l->addSpacing( 4 ); #ifndef TQT_NO_SIZEGRIP if ( d->resizer ) { - maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() ); d->box->addSpacing( 1 ); d->box->addWidget( d->resizer, 0, Qt::AlignBottom ); } @@ -496,7 +496,7 @@ bool TQStatusBar::event( TQEvent *e ) TQStatusBarPrivate::SBItem* item = d->items.first(); while ( item ) { - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -504,7 +504,7 @@ bool TQStatusBar::event( TQEvent *e ) #ifndef TQT_NO_SIZEGRIP if ( d->resizer ) - maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() ); #endif if ( maxH != d->savedStrut ) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp index 83329beba..dd31f44c8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.cpp @@ -547,7 +547,7 @@ bool TQTabBar::isTabEnabled( int id ) const /*! \reimp */ -TQSize TQTabBar::sizeHint() const +TQSize TQTabBar::tqsizeHint() const { TQSize sz(0, 0); if ( TQTab * t = l->first() ) { @@ -566,8 +566,8 @@ TQSize TQTabBar::sizeHint() const TQSize TQTabBar::tqminimumSizeHint() const { if(tqstyle().tqstyleHint( TQStyle::SH_TabBar_PreferNoArrows, this )) - return sizeHint(); - return TQSize( d->rightB->sizeHint().width() * 2 + 75, sizeHint().height() ); + return tqsizeHint(); + 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 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 @@ -1107,7 +1107,7 @@ void TQTabBar::layoutTabs() h = TQMAX( h, TQApplication::globalStrut().height() ); 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 ), TQStyleOption(t) )); x += t->r.width() - overlap; @@ -1129,7 +1129,7 @@ void TQTabBar::layoutTabs() t->r.setHeight( r.height() ); } - if ( sizeHint() != oldSh ) + if ( tqsizeHint() != oldSh ) updateGeometry(); emit layoutChanged(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h index 89c9b9e6a..1b0fa7605 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabbar.h @@ -115,7 +115,7 @@ public: bool isTabEnabled( int ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; int currentTab() const; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp index a08e9a256..5fab113e8 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.cpp @@ -681,10 +681,10 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) TQSize t( 0, d->stack->frameWidth() ); if ( d->tabs->isVisibleTo(this) ) - t = d->tabs->sizeHint(); + t = d->tabs->tqsizeHint(); int lcw = 0; if ( d->leftCornerWidget && d->leftCornerWidget->isVisible() ) { - TQSize sz = d->leftCornerWidget->sizeHint(); + TQSize sz = d->leftCornerWidget->tqsizeHint(); d->leftCornerWidget->resize(sz); lcw = sz.width(); if ( t.height() > lcw ) @@ -692,7 +692,7 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) } int rcw = 0; if ( d->rightCornerWidget && d->rightCornerWidget->isVisible() ) { - TQSize sz = d->rightCornerWidget->sizeHint(); + TQSize sz = d->rightCornerWidget->tqsizeHint(); d->rightCornerWidget->resize(sz); rcw = sz.width(); if ( t.height() > rcw ) @@ -760,20 +760,20 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) /*! \reimp */ -TQSize TQTabWidget::sizeHint() const +TQSize TQTabWidget::tqsizeHint() const { TQSize lc(0, 0), rc(0, 0); if (d->leftCornerWidget) - lc = d->leftCornerWidget->sizeHint(); + lc = d->leftCornerWidget->tqsizeHint(); if(d->rightCornerWidget) - rc = d->rightCornerWidget->sizeHint(); + rc = d->rightCornerWidget->tqsizeHint(); if ( !d->dirty ) { TQTabWidget *that = (TQTabWidget*)this; that->setUpLayout( TRUE ); } - TQSize s( d->stack->sizeHint() ); - TQSize t( d->tabs->sizeHint() ); + TQSize s( d->stack->tqsizeHint() ); + TQSize t( d->tabs->tqsizeHint() ); if(!tqstyle().tqstyleHint(TQStyle::SH_TabBar_PreferNoArrows, d->tabs)) t = t.boundedTo( TQSize(200,200) ); else @@ -781,7 +781,7 @@ TQSize TQTabWidget::sizeHint() const 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 ) ); - 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() ), 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()); } /*! diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h index 5774160b4..eb11988ad 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtabwidget.h @@ -107,7 +107,7 @@ public: int currentPageIndex() const; int indexOf( TQWidget * ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; enum TabPosition { Top, Bottom }; diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp index 90573bd49..62c1d5fe9 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -5446,9 +5446,9 @@ void TQTextEdit::setTabStopWidth( int ts ) \reimp */ -TQSize TQTextEdit::sizeHint() const +TQSize TQTextEdit::tqsizeHint() const { - // cf. TQScrollView::sizeHint() + // cf. TQScrollView::tqsizeHint() constPolish(); int f = 2 * frameWidth(); int h = fontMetrics().height(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h index 48e01341e..c78371ec1 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtextedit.h @@ -269,7 +269,7 @@ public: TQString anchorAt( const TQPoint& pos ); TQString anchorAt( const TQPoint& pos, Qt::AnchorAttribute a ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool isReadOnly() const { return readonly; } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp index d9551f63f..ed7cd5145 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar.cpp @@ -660,7 +660,7 @@ bool TQTitleBar::autoRaise() const return d->autoraise; } -TQSize TQTitleBar::sizeHint() const +TQSize TQTitleBar::tqsizeHint() const { constPolish(); TQRect menur = tqstyle().querySubControlMetrics(TQStyle::CC_TitleBar, this, diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h index 15e7ad856..44cac8121 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtitlebar_p.h @@ -89,7 +89,7 @@ public: TQWidget *window() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; #ifdef TQT_NO_WIDGET_TOPEXTRA // We provide one, since titlebar is useless otherwise. diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index 3def1675a..0701c6a3c 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -106,7 +106,7 @@ class TQToolBarSeparator : public TQWidget public: TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } public Q_SLOTS: void setOrientation( Qt::Orientation ); @@ -188,7 +188,7 @@ void TQToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize TQToolBarSeparator::sizeHint() const +TQSize TQToolBarSeparator::tqsizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); @@ -698,7 +698,7 @@ void TQToolBar::createPopup() cp->setItemChecked( i, TRUE ); if ( !maxItems ) { if ( cp->count() == 10 ) { - int h = cp->sizeHint().height(); + int h = cp->tqsizeHint().height(); maxItems = TQApplication::desktop()->height() * 10 / h; } } else if ( cp->count() >= maxItems - 1 ) { @@ -734,9 +734,9 @@ void TQToolBar::checkForExtension( const TQSize &sz ) bool tooSmall; if ( orientation() == Qt::Horizontal ) - tooSmall = sz.width() < sizeHint().width(); + tooSmall = sz.width() < tqsizeHint().width(); else - tooSmall = sz.height() < sizeHint().height(); + tooSmall = sz.height() < tqsizeHint().height(); if ( tooSmall ) { createPopup(); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp index 2a710b748..5950b1c44 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.cpp @@ -132,7 +132,7 @@ void TQToolBoxPrivate::updateTabs() } } -TQSize TQToolBoxButton::sizeHint() const +TQSize TQToolBoxButton::tqsizeHint() const { TQSize iconSize(8, 8); if ( !icon.isNull() ) diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h index d418b3c62..0ca8c38c2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbox.h @@ -145,7 +145,7 @@ public: inline void setIconSet( const TQIconSet &is ) { icon = is; update(); } inline TQIconSet iconSet() const { return icon; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; protected: diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp index d71110a43..2cfd96261 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp @@ -309,7 +309,7 @@ void TQToolButton::setToggleButton( bool enable ) /*! \reimp */ -TQSize TQToolButton::sizeHint() const +TQSize TQToolButton::tqsizeHint() const { constPolish(); @@ -356,7 +356,7 @@ TQSize TQToolButton::sizeHint() const if ( popup() && ! popupDelay() ) w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); #endif - return (tqstyle().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } @@ -365,7 +365,7 @@ TQSize TQToolButton::sizeHint() const */ TQSize TQToolButton::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } /*! @@ -918,32 +918,32 @@ void TQToolButton::popupTimerDone() TQRect screen = tqApp->desktop()->availableGeometry( this ); if ( horizontal ) { 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() ); } 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 { - 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() ); } else { - p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->sizeHint().height() ) ); + p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->tqsizeHint().height() ) ); } } } else { 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() ); } else { p = mapToGlobal( rect().topLeft() ); - p.rx() -= d->popup->sizeHint().width(); + p.rx() -= d->popup->tqsizeHint().width(); } } 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() ); } else { - p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->sizeHint().width(), 0 ) ); + p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->tqsizeHint().width(), 0 ) ); } } } diff --git a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h index 0788a05bd..3cdb9c0ef 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqtoolbutton.h @@ -92,7 +92,7 @@ public: TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char* name=0 ); ~TQToolButton(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; #ifndef TQT_NO_COMPAT diff --git a/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp b/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp index a47d56174..fbfba7909 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqvbox.cpp @@ -52,7 +52,7 @@ \ingroup organizers 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 diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp index 9310260d3..b9b576afb 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp @@ -44,7 +44,7 @@ #include "tqframe.h" #include "tqapplication.h" #include "tqcursor.h" -#include "sizegrip.h" +#include "tqsizegrip.h" #if defined(TQ_WS_WIN) #include "tqt_windows.h" #endif diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp index cca8e9b46..4bf824e59 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp @@ -492,7 +492,7 @@ void TQWidgetStack::resizeEvent(TQResizeEvent * e) \reimp */ -TQSize TQWidgetStack::sizeHint() const +TQSize TQWidgetStack::tqsizeHint() const { constPolish(); @@ -503,10 +503,10 @@ TQSize TQWidgetStack::sizeHint() const while ((w = it.current()) != 0) { ++it; - TQSize sh = w->sizeHint(); - if (w->sizePolicy().horData() == QSizePolicy::Ignored) + TQSize sh = w->tqsizeHint(); + if (w->tqsizePolicy().horData() == QSizePolicy::Ignored) sh.rwidth() = 0; - if (w->sizePolicy().verData() == QSizePolicy::Ignored) + if (w->tqsizePolicy().verData() == QSizePolicy::Ignored) sh.rheight() = 0; #ifndef QT_NO_LAYOUT size = size.expandedTo(sh).expandedTo(tqSmartMinSize(w)); @@ -534,9 +534,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const while ((w = it.current()) != 0) { ++it; TQSize sh = w->tqminimumSizeHint(); - if (w->sizePolicy().horData() == QSizePolicy::Ignored) + if (w->tqsizePolicy().horData() == QSizePolicy::Ignored) sh.rwidth() = 0; - if (w->sizePolicy().verData() == QSizePolicy::Ignored) + if (w->tqsizePolicy().verData() == QSizePolicy::Ignored) sh.rheight() = 0; #ifndef QT_NO_LAYOUT size = size.expandedTo(sh).expandedTo(w->minimumSize()); @@ -1114,7 +1114,7 @@ void TQWidgetStack::resizeEvent( TQResizeEvent * e ) \reimp */ -TQSize TQWidgetStack::sizeHint() const +TQSize TQWidgetStack::tqsizeHint() const { constPolish(); @@ -1125,10 +1125,10 @@ TQSize TQWidgetStack::sizeHint() const while ( (w = it.current()) != 0 ) { ++it; - TQSize sh = w->sizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->tqsizeHint(); + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.rwidth() = 0; - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; #ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( tqSmartMinSize(w) ); @@ -1156,9 +1156,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const while ( (w = it.current()) != 0 ) { ++it; TQSize sh = w->tqminimumSizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.rwidth() = 0; - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; #ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( w->tqminimumSize() ); diff --git a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h index b0e0159f3..5c0acfde2 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h +++ b/experimental/tqtinterface/qt4/src/widgets/tqwidgetstack.h @@ -71,7 +71,7 @@ public: int addWidget(TQWidget *, int = -1); void removeWidget(TQWidget *); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void setVisible(bool visible); @@ -186,7 +186,7 @@ public: int addWidget( TQWidget *, int = -1 ); void removeWidget( TQWidget * ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void show(); diff --git a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp index a16909002..164a670ff 100644 --- a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp +++ b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.cpp @@ -161,7 +161,7 @@ public: void doResize(); void doMove(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; TQSize baseSize() const; @@ -393,7 +393,7 @@ TQWorkspace::~TQWorkspace() } /*!\reimp */ -TQSize TQWorkspace::sizeHint() const +TQSize TQWorkspace::tqsizeHint() const { TQSize s( TQApplication::desktop()->size() ); 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 ); } -TQSize TQWorkspaceChild::sizeHint() const +TQSize TQWorkspaceChild::tqsizeHint() const { if ( !childWidget ) - return TQFrame::sizeHint() + baseSize(); + return TQFrame::tqsizeHint() + baseSize(); TQSize prefSize = windowWidget()->sizeHint().expandedTo( windowWidget()->minimumSizeHint() ); prefSize = prefSize.expandedTo( windowWidget()->tqminimumSize() ).boundedTo( windowWidget()->tqmaximumSize() ); diff --git a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h index b1649c297..2b128eca9 100644 --- a/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h +++ b/experimental/tqtinterface/qt4/src/workspace/tqworkspace.h @@ -89,7 +89,7 @@ public: TQWidgetList windowList() const; // ### merge with below in 4.0 TQWidgetList windowList( WindowOrder order ) const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool scrollBarsEnabled() const; void setScrollBarsEnabled( bool enable ); diff --git a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui index b5df98a37..56fd582f0 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui +++ b/experimental/tqtinterface/qt4/tools/assistant/finddialog.ui @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>0</height> diff --git a/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui b/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui index 2fdc1160a..3f615725b 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui +++ b/experimental/tqtinterface/qt4/tools/assistant/helpdialog.ui @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -363,7 +363,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> diff --git a/experimental/tqtinterface/qt4/tools/assistant/settingsdialog.ui b/experimental/tqtinterface/qt4/tools/assistant/settingsdialog.ui index 5b1286201..f2ae9b23b 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/settingsdialog.ui +++ b/experimental/tqtinterface/qt4/tools/assistant/settingsdialog.ui @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -352,7 +352,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -417,7 +417,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/assistant/topicchooser.ui b/experimental/tqtinterface/qt4/tools/assistant/topicchooser.ui index 2780e9ea3..364e23f57 100644 --- a/experimental/tqtinterface/qt4/tools/assistant/topicchooser.ui +++ b/experimental/tqtinterface/qt4/tools/assistant/topicchooser.ui @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/about.ui b/experimental/tqtinterface/qt4/tools/designer/designer/about.ui index 0f9126aee..db2e11b08 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/about.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/about.ui @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index 509e74374..d52fad400 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -170,7 +170,7 @@ void TQDesignerToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize TQDesignerToolBarSeparator::sizeHint() const +TQSize TQDesignerToolBarSeparator::tqsizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h index 6aeb7f4e7..adde1b4d3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -154,7 +154,7 @@ class TQDesignerToolBarSeparator : public TQWidget public: TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } public Q_SLOTS: void setOrientation( Qt::Orientation ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditor.ui index 4ce79834c..ce3f105bd 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actioneditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actioneditor.ui @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui index 9b9eedc18..e3911bd91 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>342</width> <height>0</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>0</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>0</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui index b16c79166..8497775ac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/createtemplate.ui b/experimental/tqtinterface/qt4/tools/designer/designer/createtemplate.ui index 4ad925960..322fabc98 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/createtemplate.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/createtemplate.ui @@ -138,7 +138,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -210,7 +210,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui index 2044d3af2..f5d5a019b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -821,7 +821,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -907,7 +907,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index c5d9d9494..91531c37f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -202,8 +202,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) previewPixmap->setPixmap( *w->pixmap ); else previewPixmap->setText( "" ); - spinWidth->setValue( w->sizeHint.width() ); - spinHeight->setValue( w->sizeHint.height() ); + spinWidth->setValue( w->tqsizeHint.width() ); + spinHeight->setValue( w->tqsizeHint.height() ); sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) ); sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) ); checkContainer->setChecked( w->isContainer ); @@ -313,7 +313,7 @@ void CustomWidgetEditor::heightChanged( int h ) if ( !i || !w ) return; - w->sizeHint.setHeight( h ); + w->tqsizeHint.setHeight( h ); updateCustomWidgetSizes(); } @@ -357,7 +357,7 @@ void CustomWidgetEditor::widthChanged( int wid ) if ( !i || !w ) return; - w->sizeHint.setWidth( wid ); + w->tqsizeHint.setWidth( wid ); updateCustomWidgetSizes(); } @@ -713,8 +713,8 @@ void CustomWidgetEditor::saveDescription() << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent2( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent2( indent ) << "</sizehint>" << endl; ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui index bb16593b7..9e12f4e67 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnections.ui b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnections.ui index a1ff91bec..1bf742693 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/dbconnections.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/dbconnections.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/defs.h b/experimental/tqtinterface/qt4/tools/designer/designer/defs.h index fb063178b..b6560d11c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/defs.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/defs.h @@ -34,7 +34,7 @@ #ifndef DEFS_H #define DEFS_H -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqstring.h> #define POINTER_TOOL 32000 diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctions.ui b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctions.ui index 5250f5403..5d9558781 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctions.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctions.ui @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -525,7 +525,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui index 44b443543..1c0f39f8c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index e19d0caff..0b102e9fa 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -65,7 +65,7 @@ #include <tqpalette.h> #include <tqmessagebox.h> #include <tqpopupmenu.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <tqmetaobject.h> @@ -414,8 +414,8 @@ void FormWindow::insertWidget() r.setHeight( 20 ); } } else { - r.setWidth( w->sizeHint().width() ); - r.setHeight( w->sizeHint().height() ); + r.setWidth( w->tqsizeHint().width() ); + r.setHeight( w->tqsizeHint().height() ); } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui index 50700e92e..329ca8fbf 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui index 8c9119e5f..325678dde 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp index e8266c316..acb676611 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -950,8 +950,8 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { if ( orient == Qt::Vertical ) - return (SizeType)sizePolicy().verData(); - return (SizeType)sizePolicy().horData(); + return (SizeType)tqsizePolicy().verData(); + return (SizeType)tqsizePolicy().horData(); } int Spacer::tqalignment() const @@ -972,7 +972,7 @@ TQSize Spacer::tqminimumSize() const return s; } -TQSize Spacer::sizeHint() const +TQSize Spacer::tqsizeHint() const { return sh; } @@ -982,7 +982,7 @@ void Spacer::setSizeHint( const TQSize &s ) { sh = s; if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) - resize( sizeHint() ); + resize( tqsizeHint() ); updateGeometry(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h index 1b6821d19..3b07fcc4b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.h @@ -132,7 +132,7 @@ class Spacer : public TQWidget Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) TQ_ENUMS( SizeType ) 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 ) private: @@ -150,7 +150,7 @@ public: Spacer( TQWidget *tqparent, const char *name ); TQSize tqminimumSize() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; int tqalignment() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui index 714d7da25..78e06c5bd 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/listeditor.ui index baa6b0cbc..f1e3d2a88 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listeditor.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui index 75b912e62..049d7c71f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -604,7 +604,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -649,7 +649,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index 5a78cce9a..def15eb2a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -115,7 +115,7 @@ #include <tqsettings.h> #include <tqaccel.h> #include <tqtooltip.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqtextview.h> #include <tqassistantclient.h> #include <stdlib.h> @@ -2216,8 +2216,8 @@ void MainWindow::writeConfig() l << w->className; l << w->includeFile; l << TQString::number( (int)w->includePolicy ); - l << TQString::number( w->sizeHint.width() ); - l << TQString::number( w->sizeHint.height() ); + l << TQString::number( w->tqsizeHint.width() ); + l << TQString::number( w->tqsizeHint.height() ); l << TQString::number( w->lstSignals.count() ); for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) l << TQString( fixArgs( *it ) ); @@ -2356,8 +2356,8 @@ void MainWindow::readConfig() w->className = l[ 0 ]; w->includeFile = l[ 1 ]; w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt(); - w->sizeHint.setWidth( l[ 3 ].toInt() ); - w->sizeHint.setHeight( l[ 4 ].toInt() ); + w->tqsizeHint.setWidth( l[ 3 ].toInt() ); + w->tqsizeHint.setHeight( l[ 4 ].toInt() ); uint c = 5; if ( l.count() > c ) { int numSignals = l[ c ].toInt(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 599363607..1bfc82552 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -507,7 +507,7 @@ void MenuBarEditor::deleteItem( int index ) } } -TQSize MenuBarEditor::sizeHint() const +TQSize MenuBarEditor::tqsizeHint() const { return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); } @@ -581,7 +581,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e ) lineEdit->hide(); update(); } else if ( e->type() == TQEvent::LayoutHint ) { - resize( sizeHint() ); + resize( tqsizeHint() ); } return TQMenuBar::eventFilter( o, e ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h index c6e63f12c..913f0a829 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -127,9 +127,9 @@ public: void focusItem( int index = -1 ); void deleteItem( int index = -1 ); - TQSize sizeHint() const; - TQSize tqminimumSize() const { return sizeHint(); } - TQSize tqminimumSizeHint() const { return sizeHint(); } + TQSize tqsizeHint() const; + TQSize tqminimumSize() const { return tqsizeHint(); } + TQSize tqminimumSizeHint() const { return tqsizeHint(); } int heightForWidth( int max_width ) const; void show(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp index 5bb9b30c1..501e6cc7c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp @@ -1278,7 +1278,7 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - sizeHint = TQSize( -1, -1 ); + tqsizeHint = TQSize( -1, -1 ); pixmap = new TQPixmap( TQPixmap::fromMimeSource( "designer_customwidget.png" ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); @@ -1290,7 +1290,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - sizeHint = w.sizeHint; + tqsizeHint = w.tqsizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1341,7 +1341,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - sizeHint = w.sizeHint; + tqsizeHint = w.tqsizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.h b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.h index 4f12bac46..08e01f578 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.h @@ -39,7 +39,7 @@ #include <tqstringlist.h> #include <tqmap.h> #include <tqptrlist.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqsize.h> #include <tqwidgetlist.h> #include <tqcursor.h> @@ -109,7 +109,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize sizeHint; + TQSize tqsizeHint; TQSizePolicy sizePolicy; TQPixmap *pixmap; TQValueList<TQCString> lstSignals; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui index 9e7aa1d8f..87d460388 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newform.ui b/experimental/tqtinterface/qt4/tools/designer/designer/newform.ui index 4b33a963f..ea28f3cda 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newform.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newform.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui index 41cfd9efd..36dbd59d9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui index 5cdf66713..c869d9791 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -480,7 +480,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui index 1f2195c18..59c50b900 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui index b46b68934..c456633ac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui @@ -824,7 +824,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -875,7 +875,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/preferences.ui b/experimental/tqtinterface/qt4/tools/designer/designer/preferences.ui index 81cf37b4c..51f17b355 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/preferences.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/preferences.ui @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidget.ui b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidget.ui index 5ad8ed0f0..6ecba7b0f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/previewwidget.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/previewwidget.ui @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettings.ui b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettings.ui index 7ca671846..284f554b0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/projectsettings.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/projectsettings.ui @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>71</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index a425e0693..c74d2a37b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -71,7 +71,7 @@ #include <tqcolordialog.h> #include <tqlabel.h> #include <tqlayout.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqbitmap.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -411,7 +411,7 @@ void PropertyItem::createResetButton() resetButton = new TQPushButton( hbox ); setupStyle( resetButton ); resetButton->setPixmap( TQPixmap::fromMimeSource( "designer_resetproperty.png" ) ); - resetButton->setFixedWidth( resetButton->sizeHint().width() ); + resetButton->setFixedWidth( resetButton->tqsizeHint().width() ); hbox->tqlayout()->tqsetAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); @@ -453,7 +453,7 @@ void PropertyItem::placeEditor( TQWidget *w ) r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() ); w->resize( r.size() ); 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() ); resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 130fe9c06..6c1996489 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -33,7 +33,7 @@ #include "qcompletionedit.h" #include <tqlistbox.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqapplication.h> #include <tqvbox.h> @@ -95,8 +95,8 @@ void TQCompletionEdit::placeListBox() return; } - popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), - listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); + popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), + listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) ); if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui index 68404e65a..a2a33affc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp index 2978c10ba..053c155f1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -629,7 +629,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). expandedTo( formwindow->tqminimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); } return TRUE; @@ -1424,8 +1424,8 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "sizeHint" ) ) - changed << "sizeHint"; + if ( !changed.tqcontains( "tqsizeHint" ) ) + changed << "tqsizeHint"; if ( !changed.tqcontains( "geometry" ) ) changed << "geometry"; } else { @@ -2630,8 +2630,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << 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(); while ( !n3.isNull() ) { 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" ) - w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui index b0edaeb1c..bfa704b22 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp index 76743d63a..f0c6ef32a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp @@ -64,28 +64,28 @@ void SizeHandle::updateCursor() switch ( dir ) { case LeftTop: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case Top: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case RightTop: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case Right: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; case RightBottom: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case Bottom: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case LeftBottom: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case Left: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/startdialog.ui index 5c8b9df19..531e7ac6e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialog.ui @@ -223,7 +223,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp index 90e672ccb..c2419c379 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp @@ -124,7 +124,7 @@ void StyledButton::setScale( bool on ) scalePixmap(); } -TQSize StyledButton::sizeHint() const +TQSize StyledButton::tqsizeHint() const { return TQSize( 50, 25 ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h index f624aad94..68a4adcb9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/styledbutton.h @@ -72,7 +72,7 @@ public: void setScale( bool ); bool scale() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void setFormWindow( FormWindow *fw ) { formWindow = fw; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditor.ui index 9d60116eb..fea785a9e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditor.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -447,7 +447,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -503,7 +503,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialog.ui b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialog.ui index 644c15cf1..6ea81ff6c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialog.ui @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index ab1fbc698..84ccb8572 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -94,7 +94,7 @@ #include <tqapplication.h> #include <tqsplitter.h> #include <tqtoolbox.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #ifndef TQT_NO_SQL #include "database.h" #endif @@ -1621,7 +1621,7 @@ bool TQLayoutWidget::event( TQEvent *e ) void TQLayoutWidget::updateSizePolicy() { if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) { - sp = TQWidget::sizePolicy(); + sp = TQWidget::tqsizePolicy(); return; } @@ -1666,13 +1666,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( !w->sizePolicy().mayGrowHorizontally() ) + if ( !w->tqsizePolicy().mayGrowHorizontally() ) ht &= ~TQSizePolicy::Minimum; - if ( !w->sizePolicy().mayShrinkHorizontally() ) + if ( !w->tqsizePolicy().mayShrinkHorizontally() ) ht &= ~TQSizePolicy::Maximum; - if ( w->sizePolicy().mayGrowVertically() ) + if ( w->tqsizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkVertically() ) + if ( w->tqsizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) { @@ -1687,13 +1687,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->sizePolicy().mayGrowHorizontally() ) + if ( w->tqsizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkHorizontally() ) + if ( w->tqsizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( !w->sizePolicy().mayGrowVertically() ) + if ( !w->tqsizePolicy().mayGrowVertically() ) vt &= ~TQSizePolicy::Minimum; - if ( !w->sizePolicy().mayShrinkVertically() ) + if ( !w->tqsizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) { @@ -1712,13 +1712,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->sizePolicy().mayGrowHorizontally() ) + if ( w->tqsizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkHorizontally() ) + if ( w->tqsizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( w->sizePolicy().mayGrowVertically() ) + if ( w->tqsizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkVertically() ) + if ( w->tqsizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index dbd8d3c05..77c057413 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -249,7 +249,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT 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; void updateSizePolicy(); @@ -276,11 +276,11 @@ public: setBackgroundMode( TQt::PaletteDark ); } - TQSize sizeHint() const { - TQSize sh = cusw->sizeHint; + TQSize tqsizeHint() const { + TQSize sh = cusw->tqsizeHint; if ( sh.isValid() ) return sh; - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } TQString realClassName() { return cusw->className; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui index 9c758c8c5..6a2a14aa9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/completion.cpp b/experimental/tqtinterface/qt4/tools/designer/editor/completion.cpp index 1ca2f89c2..1b42cb0eb 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/completion.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/editor/completion.cpp @@ -41,7 +41,7 @@ #include <tqapplication.h> #include <tqregexp.h> #include "arghintwidget.h" -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqtimer.h> static TQColor getColor( const TQString &type ) @@ -299,7 +299,7 @@ bool EditorCompletion::doCompletion() (void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix, (*it).prefix, (*it).postfix2 ); cList = lst; - completionPopup->resize( completionListBox->sizeHint() + + completionPopup->resize( completionListBox->tqsizeHint() + TQSize( completionListBox->verticalScrollBar()->width() + 4, completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->setCurrentItem( 0 ); @@ -698,7 +698,7 @@ void EditorCompletion::showCompletion( const TQValueList<CompletionEntry> &lst ) (void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix, (*it).prefix, (*it).postfix2 ); cList = lst; - completionPopup->resize( completionListBox->sizeHint() + + completionPopup->resize( completionListBox->tqsizeHint() + TQSize( completionListBox->verticalScrollBar()->width() + 4, completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->setCurrentItem( 0 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/editor/preferences.ui b/experimental/tqtinterface/qt4/tools/designer/editor/preferences.ui index 739baee7a..9b65ef2a3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/editor/preferences.ui +++ b/experimental/tqtinterface/qt4/tools/designer/editor/preferences.ui @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui index cf4a28aa3..46963e6c9 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui index 047066b3d..4dd138633 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui index 86cc17e48..6a5a1f1cd 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>11</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui index fb205e638..2863f02f8 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>9</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui index bb4682ff4..2e8a4c248 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>10</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui index b7bab2a19..00aa9a0e4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/metric/metric.ui b/experimental/tqtinterface/qt4/tools/designer/examples/metric/metric.ui index 580f54f9a..8ff442783 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/metric/metric.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/metric/metric.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui b/experimental/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui index 47cf042cf..5e78a473f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui +++ b/experimental/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui index ea98fb658..468525fe2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui index 55b335e4c..b6d8642c6 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -249,7 +249,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp index 770d3e94b..cb716619b 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp @@ -555,15 +555,15 @@ bool Dlg2Ui::isWidgetType( const TQDomElement& e ) void Dlg2Ui::emitSpacer( int spacing, int stretch ) { TQString orientationStr; - TQSize sizeHint; + TQSize tqsizeHint; TQString sizeType = TQString( "Fixed" ); if ( yyBoxKind == TQString("hbox") ) { orientationStr = TQString( "Horizontal" ); - sizeHint = TQSize( spacing, 20 ); + tqsizeHint = TQSize( spacing, 20 ); } else { orientationStr = TQString( "Vertical" ); - sizeHint = TQSize( 20, spacing ); + tqsizeHint = TQSize( 20, spacing ); } if ( stretch > 0 ) sizeType = TQString( "Expanding" ); @@ -573,7 +573,7 @@ void Dlg2Ui::emitSpacer( int spacing, int stretch ) TQString("Spacer%1").arg(uniqueSpacer++).latin1() ); emitProperty( TQString("orientation"), orientationStr, TQString("enum") ); if ( spacing > 0 ) - emitProperty( TQString("sizeHint"), sizeHint, TQString("qsize") ); + emitProperty( TQString("tqsizeHint"), tqsizeHint, TQString("qsize") ); emitProperty( TQString("sizeType"), sizeType, TQString("enum") ); emitClosing( TQString("spacer") ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/experimental/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4931878b5..4571cf5df 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -43,7 +43,7 @@ #include <tqmessagebox.h> #include <tqrect.h> #include <tqregexp.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <ctype.h> diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui index 365d960e0..7e8dadad5 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -545,7 +545,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -562,7 +562,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -625,7 +625,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -642,7 +642,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui index 6137629a2..c08c8297d 100644 --- a/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui +++ b/experimental/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -665,7 +665,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -722,7 +722,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -930,7 +930,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -974,7 +974,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1074,7 +1074,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1125,7 +1125,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1176,7 +1176,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1282,7 +1282,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1365,7 +1365,7 @@ name like "qt%" <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1382,7 +1382,7 @@ name like "qt%" <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -1488,7 +1488,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1551,7 +1551,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1568,7 +1568,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1585,7 +1585,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/shared/domtool.cpp b/experimental/tqtinterface/qt4/tools/designer/shared/domtool.cpp index 8175b2a95..0c50fbfc2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/shared/domtool.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/shared/domtool.cpp @@ -33,7 +33,7 @@ #include "domtool.h" -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqcolor.h> #include <tqcursor.h> #include <tqdatetime.h> diff --git a/experimental/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/experimental/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp index b49537efe..bf6335d00 100644 --- a/experimental/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp @@ -44,7 +44,7 @@ #include <tqfont.h> #include <tqobject.h> #include <tqrect.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> /* The .uib file format is the binary counterpart of the .ui file diff --git a/experimental/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui b/experimental/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui index 12a0b2917..9ae02fe7a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui b/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui index 0d153bdea..24ecc7fdc 100644 --- a/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui +++ b/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui b/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui index 687493549..dd354f039 100644 --- a/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui +++ b/experimental/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui b/experimental/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui index 5ef82c02e..64a2ed358 100644 --- a/experimental/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui +++ b/experimental/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp b/experimental/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp index a0bc77ca9..4a5b8aeae 100644 --- a/experimental/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp @@ -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 ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w.w->sizeHint().width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w.w->sizeHint().height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w.w->tqsizeHint().width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w.w->tqsizeHint().height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << ( w.w->inherits( "TQGroupBox" ) || w.w->inherits( "TQWidgetStack" ) ) << "</container>" << endl; diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp index a489e22aa..1ce89b813 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -35,7 +35,7 @@ #include "parser.h" #include "domtool.h" #include <tqregexp.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqstringlist.h> #define NO_STATIC_COLORS #include <globaldefs.h> diff --git a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp index 488813b21..5eed17534 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -909,7 +909,7 @@ TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentC objClass = e.tagName(); 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(); bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; diff --git a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index 7b6168d32..57ea8381f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -693,7 +693,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, if ( name == "orientation" ) { vertical = ( value == "Vertical" ); - } else if ( name == "sizeHint" ) { + } else if ( name == "tqsizeHint" ) { w = value.toSize().width(); h = value.toSize().height(); } else if ( name == "sizeType" ) { @@ -1949,7 +1949,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) orient = Qt::Vertical; } else if ( prop == "sizeType" ) { sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); - } else if ( prop == "sizeHint" ) { + } else if ( prop == "tqsizeHint" ) { w = n.firstChild().firstChild().firstChild().toText().data().toInt(); h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt(); } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/about.ui b/experimental/tqtinterface/qt4/tools/linguist/linguist/about.ui index 875b85470..4d57398a2 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/about.ui +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/about.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp index b0907eaaa..15177c06e 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp @@ -165,7 +165,7 @@ PhraseLV::~PhraseLV() // delete what; } -TQSize PhraseLV::sizeHint() const +TQSize PhraseLV::tqsizeHint() const { - return TQSize( TQListView::sizeHint().width(), 50 ); + return TQSize( TQListView::tqsizeHint().width(), 50 ); } diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h index 0317b532a..e6fedd622 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/phraselv.h @@ -74,7 +74,7 @@ public: PhraseLV( TQWidget *tqparent, const char *name ); ~PhraseLV(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: TQWhatsThis *what; diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui b/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui index 59c7570b5..1d304d7c0 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h b/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h index 886027320..0207d0ab8 100644 --- a/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h +++ b/experimental/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h @@ -33,7 +33,7 @@ void Statistics::init() { - setFixedHeight( sizeHint().height() ); + setFixedHeight( tqsizeHint().height() ); } void Statistics::updateStats( int w1, int c1, int cs1, int w2, int c2, int cs2 ) diff --git a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp index 57eaa3175..22b6a8bbe 100644 --- a/experimental/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/experimental/tqtinterface/qt4/tools/qconfig/main.cpp @@ -533,7 +533,7 @@ void Main::loadFeatures(const TQString& filename) } #ifdef FIXED_LAYOUT - lv->setFixedWidth(lv->sizeHint().width()); + lv->setFixedWidth(lv->tqsizeHint().width()); #endif } @@ -727,7 +727,7 @@ int main(int argc, char** argv) } m.loadFeatures(qfeatures); m.loadConfig(qconfig); - m.resize(m.sizeHint()+TQSize(500,300)); + m.resize(m.tqsizeHint()+TQSize(500,300)); app.setMainWidget(&m); m.show(); return app.exec(); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp index a5f027174..4dd152f6e 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp +++ b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp @@ -76,7 +76,7 @@ void ColorButton::changeColor() } -TQSize ColorButton::sizeHint() const +TQSize ColorButton::tqsizeHint() const { return TQSize(40, 25); } diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.h b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.h index c052ff81d..451c6df03 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.h +++ b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.h @@ -49,7 +49,7 @@ public: const TQColor &color() const { return col; } void setColor(const TQColor &); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void mousePressEvent(TQMouseEvent *); diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui b/experimental/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui index 5b8d0045a..fb56464af 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui +++ b/experimental/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -1039,7 +1039,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -1157,7 +1157,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1321,7 +1321,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui index 7f108ea33..8daf96190 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui +++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -515,7 +515,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui index 58602235a..a01b57cd4 100644 --- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui +++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/qvfb/config.ui b/experimental/tqtinterface/qt4/tools/qvfb/config.ui index 22245a0a7..f7a8b6c41 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/config.ui +++ b/experimental/tqtinterface/qt4/tools/qvfb/config.ui @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1397,7 +1397,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1414,7 +1414,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1444,7 +1444,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp index 1e01c5135..8fb4cb19a 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfb.cpp @@ -114,7 +114,7 @@ void TQVFb::init( int display_id, int w, int h, int d, const TQString &skin_name view->setMargin( 0 ); view->setFrameStyle( TQFrame::NoFrame ); setCentralWidget( view ); - resize( sizeHint() ); + resize( tqsizeHint() ); view->show(); } diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp index 163c41d49..f7d066926 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.cpp @@ -165,7 +165,7 @@ TQVFbView::~TQVFbView() unlink( keyboardPipe ); } -TQSize TQVFbView::sizeHint() const +TQSize TQVFbView::tqsizeHint() const { int f = 2 * frameWidth(); return TQSize( contentsWidth() + f, contentsHeight() + f ); diff --git a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h index af85f541f..df5adcc6c 100644 --- a/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h +++ b/experimental/tqtinterface/qt4/tools/qvfb/qvfbview.h @@ -67,7 +67,7 @@ public: double zoom() const { return zm; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; public Q_SLOTS: void setTouchscreenEmulation( bool ); |