diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:54:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:54:16 -0600 |
commit | d4e11a5f488204ab8886e167c7c4af1e6e16ab58 (patch) | |
tree | 367a2caa6169a869cfbf6395dffe2d28e0f72654 /tdeui | |
parent | 2c4de80e1e29b261fe8770483f97b2d702e4bd08 (diff) | |
download | tdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.tar.gz tdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.zip |
Use non-tq sizeHint functions to fix bindings
Diffstat (limited to 'tdeui')
77 files changed, 280 insertions, 280 deletions
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp index e67d46840..a65303c45 100644 --- a/tdeui/kaboutdialog.cpp +++ b/tdeui/kaboutdialog.cpp @@ -58,8 +58,8 @@ class KAboutTabWidget : public TQTabWidget { public: KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize tqsizeHint() const { - return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); + TQSize sizeHint() const { + return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); } }; @@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void ) } gbox->activate(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } @@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ ) } -TQSize KAboutContributor::tqsizeHint( void ) const +TQSize KAboutContributor::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -427,9 +427,9 @@ void KAboutContainerBase::show( void ) TQWidget::show(); } -TQSize KAboutContainerBase::tqsizeHint( void ) const +TQSize KAboutContainerBase::sizeHint( void ) const { - return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); + return tqminimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); } void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) @@ -790,7 +790,7 @@ void KAboutContainer::childEvent( TQChildEvent *e ) TQWidget* const w = static_cast<TQWidget *>(e->child()); mVbox->addWidget( w, 0, mAlignment ); - const TQSize s( tqsizeHint() ); + const TQSize s( sizeHint() ); setMinimumSize( s ); TQObjectList const l = childrenListObject(); // silence please @@ -806,10 +806,10 @@ void KAboutContainer::childEvent( TQChildEvent *e ) } -TQSize KAboutContainer::tqsizeHint( void ) const +TQSize KAboutContainer::sizeHint( void ) const { // - // The size is computed by adding the tqsizeHint().height() of all + // The size is computed by adding the sizeHint().height() of all // widget children and taking the width of the widest child and adding // layout()->margin() and layout()->spacing() // @@ -831,10 +831,10 @@ TQSize KAboutContainer::tqsizeHint( void ) const TQSize s = w->tqminimumSize(); if( s.isEmpty() ) { - s = w->tqminimumSizeHint(); + s = w->minimumSizeHint(); if( s.isEmpty() ) { - s = w->tqsizeHint(); + s = w->sizeHint(); if( s.isEmpty() ) { s = TQSize( 100, 100 ); // Default size @@ -864,9 +864,9 @@ TQSize KAboutContainer::tqsizeHint( void ) const } -TQSize KAboutContainer::tqminimumSizeHint( void ) const +TQSize KAboutContainer::minimumSizeHint( void ) const { - return tqsizeHint(); + return sizeHint(); } @@ -960,8 +960,8 @@ public: void setWork(const TQString&); /** The size hint. Very important here, since KAboutWidget relies on it for * geometry management. */ - TQSize tqsizeHint(); - TQSize tqminimumSizeHint(void); + TQSize sizeHint(); + TQSize minimumSizeHint(void); virtual void show( void ); // ---------------------------------------------------------------------------- @@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w) #if 0 QSize -KAboutContributor::tqsizeHint() +KAboutContributor::sizeHint() { // ############################################################################ const int FrameWidth=frameWidth(); @@ -1104,8 +1104,8 @@ KAboutContributor::tqsizeHint() int maxx, maxy; TQRect rect; // ----- first calculate name and email width: - maxx=name->tqsizeHint().width(); - maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION); + maxx=name->sizeHint().width(); + maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION); // ----- now determine "work" text rectangle: if(!work.isEmpty()) // save time { @@ -1116,10 +1116,10 @@ KAboutContributor::tqsizeHint() { maxx=WorkTextWidth+WORKTEXT_IDENTATION; } - maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION); + maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION); // ----- - maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels - maxy+=/* email */ name->tqsizeHint().height(); + maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels + maxy+=/* email */ name->sizeHint().height(); maxy+=rect.height(); // ----- maxx+=2*FrameWidth; @@ -1128,16 +1128,16 @@ KAboutContributor::tqsizeHint() // ############################################################################ } -TQSize KAboutContributor::tqminimumSizeHint(void) +TQSize KAboutContributor::minimumSizeHint(void) { - return( tqsizeHint() ); + return( sizeHint() ); } void KAboutContributor::show( void ) { TQFrame::show(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } @@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*) int cy=framewidth; // ----- name->setGeometry - (framewidth, framewidth, childwidth, name->tqsizeHint().height()); + (framewidth, framewidth, childwidth, name->sizeHint().height()); cy=name->height()+Grid; email->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height()); cy+=name->height()+Grid; url->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height()); // the work text is drawn in the paint event // ############################################################################ } @@ -1186,15 +1186,15 @@ KAboutContributor::paintEvent(TQPaintEvent* e) #if 0 -TQSize KAboutContributor::tqsizeHint( void ) +TQSize KAboutContributor::sizeHint( void ) { int s = KDialog::spacingHint(); int h = fontMetrics().lineSpacing()*3 + 2*s; int m = frameWidth(); - int w = name->tqsizeHint().width(); - w = QMAX( w, email->tqsizeHint().width()+s); - w = QMAX( w, url->tqsizeHint().width()+s); + int w = name->sizeHint().width(); + w = QMAX( w, email->sizeHint().width()+s); + w = QMAX( w, url->sizeHint().width()+s); if( work.isEmpty() == false ) { @@ -1214,10 +1214,10 @@ TQSize KAboutContributor::tqsizeHint( void ) int s = 3; int m = frameWidth() + KDialog::spacingHint(); int h = ls * 3 + s * 2; - int w = name->tqsizeHint().width(); + int w = name->sizeHint().width(); - w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION); - w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION); if( work.isEmpty() == false ) { const int WorkTextWidth=200; @@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*) int x = frameWidth() + KDialog::spacingHint(); int y = x; int w = width() - 2*x; - int h = name->tqsizeHint().height(); + int h = name->sizeHint().height(); int s = 3; name->setGeometry( x, y, w, h ); @@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e ) int s = 3; int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION; int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint()); - int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3; + int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3; int h = height()-y-frameWidth(); TQPainter paint( this ); @@ -1350,33 +1350,33 @@ KAboutWidget::adjust() // ----- if(showMaintainer) { - total_size=maintainer->tqsizeHint(); + total_size=maintainer->sizeHint(); maintWidth=total_size.width(); maintHeight=total_size.height(); } else { maintWidth=0; maintHeight=0; } - total_size=author->tqsizeHint(); + total_size=author->sizeHint(); logo->adjustSize(); - cy=version->tqsizeHint().height()+Grid; + cy=version->sizeHint().height()+Grid; cx=logo->width(); tempx=QMAX(total_size.width(), maintWidth); cx+=Grid+tempx; - cx=QMAX(cx, version->tqsizeHint().width()); + cx=QMAX(cx, version->sizeHint().width()); cy+=QMAX(logo->height(), total_size.height()+(showMaintainer ? Grid+maintHeight : 0)); // ----- if(!contributors.isEmpty()) { - cx=QMAX(cx, cont->tqsizeHint().width()); - cy+=cont->tqsizeHint().height()+Grid; + cx=QMAX(cx, cont->sizeHint().width()); + cy+=cont->sizeHint().height()+Grid; TQPtrListIterator<KAboutContributor> _pos(contributors); KAboutContributor* currEntry; while ( (currEntry = _pos.current()) ) { ++_pos; - cy+=currEntry->tqsizeHint().height(); + cy+=currEntry->sizeHint().height(); } } // ----- @@ -1459,7 +1459,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) // ############################################################################ int _x=0, _y, cx, tempx, tempy; // ----- set version label geometry: - version->setGeometry(0, 0, width(), version->tqsizeHint().height()); + version->setGeometry(0, 0, width(), version->sizeHint().height()); _y=version->height()+Grid; // ----- move logo to correct position: logo->adjustSize(); @@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*) tempx=logo->width()+Grid; cx=width()-tempx; author->setGeometry - (tempx, _y, cx, author->tqsizeHint().height()); + (tempx, _y, cx, author->sizeHint().height()); maintainer->setGeometry - (tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height()); + (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height()); _y+=QMAX(logo->height(), author->height()+(showMaintainer ? Grid+maintainer->height() : 0)); // ----- if(!contributors.isEmpty()) { - tempy=cont->tqsizeHint().height(); + tempy=cont->sizeHint().height(); cont->setGeometry(0, _y, width(), tempy); cont->show(); _y+=tempy+Grid; @@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) while( (currEntry = _pos.current()) ) { ++_pos; - tempy=currEntry->tqsizeHint().height(); + tempy=currEntry->sizeHint().height(); // y+=Grid; currEntry->setGeometry(_x, _y, width(), tempy); _y+=tempy; @@ -1567,7 +1567,7 @@ void KAboutDialog::adjust() if( !about ) { return; } about->adjust(); //initializeGeometry(); - resize( tqsizeHint() ); + resize( sizeHint() ); } diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h index 9c87feb8e..01a515959 100644 --- a/tdeui/kaboutdialog.h +++ b/tdeui/kaboutdialog.h @@ -66,8 +66,8 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame bool showframe = false, bool showBold = false ); void addImage( const TQString &fileName, int tqalignment=AlignLeft ); - virtual TQSize tqsizeHint( void ) const; - virtual TQSize tqminimumSizeHint( void ) const; + virtual TQSize sizeHint( void ) const; + virtual TQSize minimumSizeHint( void ) const; protected: virtual void childEvent( TQChildEvent *e ); @@ -115,7 +115,7 @@ class TDEUI_EXPORT KAboutContributor : public TQFrame TQString getURL( void ) const; TQString getWork( void ) const; - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; protected: virtual void fontChange( const TQFont &oldFont ); diff --git a/tdeui/kaboutdialog_private.h b/tdeui/kaboutdialog_private.h index 3f6ffedd5..6eb4cc312 100644 --- a/tdeui/kaboutdialog_private.h +++ b/tdeui/kaboutdialog_private.h @@ -88,7 +88,7 @@ class KAboutContainerBase : public TQWidget public: KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); virtual void show( void ); - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; void setTitle( const TQString &title ); void setImage( const TQString &fileName ); diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index f1ff7e169..f9acb0ea9 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -627,8 +627,8 @@ void KSelectAction::updateItems( int id ) TQStringList::ConstIterator it = lst.begin(); for( ; it != lst.end(); ++it ) cb->insertItem( *it ); - // qt caches and never recalculates the tqsizeHint() - // qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint + // qt caches and never recalculates the sizeHint() + // qcombobox.cpp recommends calling setFont to tqinvalidate the sizeHint // setFont sets own_font = True, so we're a bit mean and calll // unsetFont which calls setFont and then overwrites the own_font cb->unsetFont(); @@ -678,7 +678,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) if ( cb ) { if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); if ( d->m_comboWidth > 0 ) { cb->setMinimumWidth( d->m_comboWidth ); @@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index e16de1374..f0398c1b7 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -111,7 +111,7 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e ) } } -TQSize KActiveLabel::tqminimumSizeHint() const +TQSize KActiveLabel::minimumSizeHint() const { TQSize ms = tqminimumSize(); if ((ms.width() > 0) && (ms.height() > 0)) @@ -134,9 +134,9 @@ TQSize KActiveLabel::tqminimumSizeHint() const return TQSize(w, h); } -TQSize KActiveLabel::tqsizeHint() const +TQSize KActiveLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } #include "kactivelabel.moc" diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h index 027ea2461..5832a4fa1 100644 --- a/tdeui/kactivelabel.h +++ b/tdeui/kactivelabel.h @@ -56,8 +56,8 @@ public: */ KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0); - TQSize tqminimumSizeHint() const; - TQSize tqsizeHint() const; + TQSize minimumSizeHint() const; + TQSize sizeHint() const; public slots: /** diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp index ab0d6785c..4d166b7b3 100644 --- a/tdeui/karrowbutton.cpp +++ b/tdeui/karrowbutton.cpp @@ -40,7 +40,7 @@ KArrowButton::~KArrowButton() delete d; } -TQSize KArrowButton::tqsizeHint() const +TQSize KArrowButton::sizeHint() const { return TQSize( 12, 12 ); } diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h index 1d4c20bca..90f56d9bb 100644 --- a/tdeui/karrowbutton.h +++ b/tdeui/karrowbutton.h @@ -59,7 +59,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton /** * Reimplemented from TQPushButton. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Returns the arrow type diff --git a/tdeui/kauthicon.cpp b/tdeui/kauthicon.cpp index fa49a1d26..fe267a754 100644 --- a/tdeui/kauthicon.cpp +++ b/tdeui/kauthicon.cpp @@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockBox = new TQLabel(this); lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised); lockBox->setPixmap(lockPM); - lockBox->setFixedSize(lockBox->tqsizeHint()); + lockBox->setFixedSize(lockBox->sizeHint()); lockLabel = new TQLabel(this); lockLabel->setFrameStyle(TQFrame::NoFrame); @@ -114,7 +114,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) else lockLabel->setText(openLockText); lockLabel->tqsetAlignment(AlignCenter); - lockLabel->setMinimumSize(lockLabel->tqsizeHint()); + lockLabel->setMinimumSize(lockLabel->sizeHint()); lockLabel->setText(lockText); layout = new TQHBoxLayout(this); @@ -124,7 +124,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); layout->activate(); - resize(tqsizeHint()); + resize(sizeHint()); } KAuthIcon::~KAuthIcon() @@ -132,7 +132,7 @@ KAuthIcon::~KAuthIcon() } -TQSize KAuthIcon::tqsizeHint() const +TQSize KAuthIcon::sizeHint() const { return layout->tqminimumSize(); } diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h index ef25de411..343af5e6e 100644 --- a/tdeui/kauthicon.h +++ b/tdeui/kauthicon.h @@ -55,7 +55,7 @@ public: KAuthIcon(TQWidget *parent = 0, const char *name = 0); ~KAuthIcon(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * return the status of whatever is being monitored. */ diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp index 25bd6c71b..11a8e2818 100644 --- a/tdeui/kbuttonbox.cpp +++ b/tdeui/kbuttonbox.cpp @@ -39,7 +39,7 @@ * which makes the buttons look better. * * 01/17/98 Mario Weilguni <mweilguni@sime.com> - * Fixed a bug in tqsizeHint() + * Fixed a bug in sizeHint() * Improved the handling of Motif default buttons * * 01/09/98 Mario Weilguni <mweilguni@sime.com> @@ -178,7 +178,7 @@ void KButtonBox::layout() { ++itr; } - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } void KButtonBox::placeButtons() { @@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const { return s; } -TQSize KButtonBox::tqsizeHint() const { +TQSize KButtonBox::sizeHint() const { unsigned int dw; if(data->buttons.isEmpty()) @@ -355,7 +355,7 @@ TQSizePolicy KButtonBox::sizePolicy() const * as minimum width */ TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const { - TQSize s = b->tqsizeHint(); + TQSize s = b->sizeHint(); const TQSize ms = b->tqminimumSize(); if(s.width() < minButtonWidth) s.setWidth(minButtonWidth); diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h index 381cf8ba6..6044bdb53 100644 --- a/tdeui/kbuttonbox.h +++ b/tdeui/kbuttonbox.h @@ -65,7 +65,7 @@ public: * This size is * calculated by the width/height of all buttons plus border/autoborder. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent *); diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 7bd0320c9..1540b2622 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -110,7 +110,7 @@ void KCharSelectTable::setTableNum( int _tableNum ) } //================================================================== -TQSize KCharSelectTable::tqsizeHint() const +TQSize KCharSelectTable::sizeHint() const { int w = cellWidth(); int h = cellHeight(); @@ -381,30 +381,30 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f bar->setSpacing( KDialog::spacingHint() ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); - lFont->resize( lFont->tqsizeHint() ); + lFont->resize( lFont->sizeHint() ); lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lFont->setMaximumWidth( lFont->tqsizeHint().width() ); + lFont->setMaximumWidth( lFont->sizeHint().width() ); fontCombo = new TQComboBox( true, bar ); fillFontCombo(); - fontCombo->resize( fontCombo->tqsizeHint() ); + fontCombo->resize( fontCombo->sizeHint() ); connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); - lTable->resize( lTable->tqsizeHint() ); + lTable->resize( lTable->sizeHint() ); lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lTable->setMaximumWidth( lTable->tqsizeHint().width() ); + lTable->setMaximumWidth( lTable->sizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); - tableSpinBox->resize( tableSpinBox->tqsizeHint() ); + tableSpinBox->resize( tableSpinBox->sizeHint() ); connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); - lUnicode->resize( lUnicode->tqsizeHint() ); + lUnicode->resize( lUnicode->sizeHint() ); lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() ); + lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); @@ -412,7 +412,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f d->tqunicodeLine = new KLineEdit( bar ); d->tqunicodeLine->setValidator(validator); lUnicode->setBuddy(d->tqunicodeLine); - d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() ); + d->tqunicodeLine->resize( d->tqunicodeLine->sizeHint() ); slotUpdateUnicode(_chr); connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); @@ -452,9 +452,9 @@ KCharSelect::~KCharSelect() } //================================================================== -TQSize KCharSelect::tqsizeHint() const +TQSize KCharSelect::sizeHint() const { - return TQVBox::tqsizeHint(); + return TQVBox::sizeHint(); } //================================================================== diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h index 244f06953..3baf2fc46 100644 --- a/tdeui/kcharselect.h +++ b/tdeui/kcharselect.h @@ -56,7 +56,7 @@ public: KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, int _tableNum ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void resizeEvent( TQResizeEvent * ); virtual void setFont( const TQString &_font ); @@ -157,7 +157,7 @@ public: /** * Reimplemented. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Sets the font which is displayed to @p font diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index c208d96f4..34227a8fb 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -130,7 +130,7 @@ void KColorButton::drawButtonLabel( TQPainter *painter ) } } -TQSize KColorButton::tqsizeHint() const +TQSize KColorButton::sizeHint() const { return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). expandedTo(TQApplication::globalStrut()); diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h index 40d069bb0..d750d3dff 100644 --- a/tdeui/kcolorbutton.h +++ b/tdeui/kcolorbutton.h @@ -80,7 +80,7 @@ public: */ void setDefaultColor( const TQColor &c ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: /** diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index 9f0ae9727..5034e0f43 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -597,7 +597,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); - setFixedSize( tqsizeHint()); + setFixedSize( sizeHint()); connect( combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette( const TQString &))); } @@ -1157,7 +1157,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( setColor( const TQColor&))); tl_layout->activate(); - page->setMinimumSize( page->tqsizeHint() ); + page->setMinimumSize( page->sizeHint() ); readSettings(); d->bRecursion = false; @@ -1223,7 +1223,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // cancel setFixedSize() d->tl_layout->activate(); - mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() ); + mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); disableResize(); connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 2b6b0098c..df84d0032 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget new TQListViewItem( m_pListView, *it ); } - m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); + m_pListView->setMinimumSize( m_pListView->sizeHint() ); connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); - resize( tqsizeHint() ); + resize( sizeHint() ); } KHistoryComboEditor::~KHistoryComboEditor() diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp index 7e3d156a2..988c1f1cc 100644 --- a/tdeui/kcompletionbox.cpp +++ b/tdeui/kcompletionbox.cpp @@ -260,7 +260,7 @@ void KCompletionBox::popup() clearSelection(); if ( !isVisible() ) show(); - else if ( size().height() != tqsizeHint().height() ) + else if ( size().height() != sizeHint().height() ) sizeAndPosition(); } } @@ -335,8 +335,8 @@ TQRect KCompletionBox::calculateGeometry() const int ih = itemHeight(); int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth(); - int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width(); - w = QMAX( KListBox::tqminimumSizeHint().width(), w ); + int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width(); + w = QMAX( KListBox::minimumSizeHint().width(), w ); //If we're inside a combox, Qt by default makes the dropdown // as wide as the combo, and gives the style a chance @@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const return TQRect(x, y, w, h); } -TQSize KCompletionBox::tqsizeHint() const +TQSize KCompletionBox::sizeHint() const { return calculateGeometry().size(); } @@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != tqsizeHint().height() ) + if ( isVisible() && size().height() != sizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h index 9d6b33a49..b60962214 100644 --- a/tdeui/kcompletionbox.h +++ b/tdeui/kcompletionbox.h @@ -61,7 +61,7 @@ public: */ ~KCompletionBox(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * @returns true if selecting an item results in the emition of the selected signal. diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index ab41fec15..77ff907d7 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -390,7 +390,7 @@ KDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); @@ -467,9 +467,9 @@ KDatePicker::todayButtonClicked() } TQSize -KDatePicker::tqsizeHint() const +KDatePicker::sizeHint() const { - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } void diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h index 522884211..381095c49 100644 --- a/tdeui/kdatepicker.h +++ b/tdeui/kdatepicker.h @@ -90,7 +90,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Sets the date. diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index a2bbdf9d3..e139ffd90 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -561,14 +561,14 @@ void KDateTable::focusOutEvent( TQFocusEvent *e ) } TQSize -KDateTable::tqsizeHint() const +KDateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl; + kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -713,7 +713,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker } TQSize -KDateInternalMonthPicker::tqsizeHint() const +KDateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h index 159b32244..04a05804c 100644 --- a/tdeui/kdatetbl.h +++ b/tdeui/kdatetbl.h @@ -98,7 +98,7 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -289,9 +289,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index e9082b657..959de3cc1 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -428,7 +428,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent) setCaption( i18n("Please wait...") ); // Center the dialog - TQSize sh = tqsizeHint(); + TQSize sh = sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 655eff862..93d1cb58e 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -230,7 +230,7 @@ void SButton::resize( bool sameWidth, int margin, for( p = list.first(); p; p = list.next() ) { - const TQSize s( p->tqsizeHint() ); + const TQSize s( p->sizeHint() ); if( s.height() > h ) { h = s.height(); } if( s.width() > w ) { w = s.width(); } } @@ -239,7 +239,7 @@ void SButton::resize( bool sameWidth, int margin, { for( p = list.first(); p; p = list.next() ) { - TQSize s( p->tqsizeHint() ); + TQSize s( p->sizeHint() ); if( sameWidth ) { s.setWidth( w ); } p->setFixedWidth( s.width() ); t += s.width() + spacing; @@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin, // sameWidth has no effect here for( p = list.first(); p; p = list.next() ) { - TQSize s( p->tqsizeHint() ); + TQSize s( p->sizeHint() ); s.setWidth( w ); p->setFixedSize( s ); t += s.height() + spacing; @@ -429,17 +429,17 @@ void KDialogBase::adjustSize() // if (layout()) // layout()->activate(); if( d->bFixed ) - setFixedSize( tqsizeHint() ); + setFixedSize( sizeHint() ); else - resize( tqsizeHint() ); + resize( sizeHint() ); } -TQSize KDialogBase::tqsizeHint() const +TQSize KDialogBase::sizeHint() const { - return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize; + return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize; } -TQSize KDialogBase::tqminimumSizeHint() const +TQSize KDialogBase::minimumSizeHint() const { const int m = marginHint(); const int s = spacingHint(); @@ -464,13 +464,13 @@ TQSize KDialogBase::tqminimumSizeHint() const // if( mJanus ) { - s2 = mJanus->tqminimumSizeHint() + zeroByS; + s2 = mJanus->minimumSizeHint() + zeroByS; } else if( mMainWidget ) { - s2 = mMainWidget->tqsizeHint() + zeroByS; + s2 = mMainWidget->sizeHint() + zeroByS; s2 = s2.expandedTo( mMainWidget->tqminimumSize() ); - s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() ); + s2 = s2.expandedTo( mMainWidget->minimumSizeHint() ); if( s2.isEmpty() ) { s2 = TQSize( 100, 100+s ); @@ -485,9 +485,9 @@ TQSize KDialogBase::tqminimumSizeHint() const if (d->detailsWidget && d->bDetails) { - s2 = d->detailsWidget->tqsizeHint() + zeroByS; + s2 = d->detailsWidget->sizeHint() + zeroByS; s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() ); - s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() ); + s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() ); s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); } @@ -530,7 +530,7 @@ TQSize KDialogBase::tqminimumSizeHint() const void KDialogBase::disableResize() { - setFixedSize( tqsizeHint() ); + setFixedSize( sizeHint() ); } @@ -748,7 +748,7 @@ void KDialogBase::setButtonStyle( int style ) { newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler))); if (newButton) - lay->addSpacing(newButton->tqsizeHint().width()); + lay->addSpacing(newButton->sizeHint().width()); } continue; } @@ -1751,8 +1751,8 @@ TQSize KDialogBase::configDialogSize( KConfig& config, int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - w = tqsizeHint().width(); - h = tqsizeHint().height(); + w = sizeHint().width(); + h = sizeHint().height(); KConfigGroupSaver cs(&config, groupName); w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w ); diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index ad33e24a0..d89b8c67e 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -426,8 +426,8 @@ class TDEUI_EXPORT KDialogBase : public KDialog * resized before showing it. **/ virtual void adjustSize(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Retrieve the empty page when the predefined layout is used in @p Plain @@ -828,7 +828,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, tqsizeHint() is returned. + * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param groupName Name of the group to read from. The old group * of KGlobal::config is preserved. @@ -837,7 +837,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, tqsizeHint() is returned. + * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index a27d4cb6c..005f76b4b 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -345,7 +345,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) layout->activate(); kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl; //FIXME somebody left this here, but we don't know what the hell it's for. - drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/tqsizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index a02c2ead4..64624df82 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -51,8 +51,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget* curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(tqsizeHint().isValid()) - setMinimumSize(tqsizeHint()); + if(sizeHint().isValid()) + setMinimumSize(sizeHint()); setAcceptDrops(true); } @@ -72,8 +72,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(tqsizeHint().isValid()) - setMinimumSize(tqsizeHint()); + if(sizeHint().isValid()) + setMinimumSize(sizeHint()); setAcceptDrops(true); } @@ -104,7 +104,7 @@ TQColor KDualColorButton::currentColor() const return (curColor == Background ? bg.color() : fg.color()); } -TQSize KDualColorButton::tqsizeHint() const +TQSize KDualColorButton::sizeHint() const { return TQSize(34, 34); } diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h index 3dd8b1e07..5b49be30e 100644 --- a/tdeui/kdualcolorbutton.h +++ b/tdeui/kdualcolorbutton.h @@ -94,7 +94,7 @@ public: * Returns the minimum size needed to display the widget and all its * controls. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: /** * Sets the foreground color. diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 98a1f0537..e57a641a7 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -427,7 +427,7 @@ void KEditToolbar::init() connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); enableButtonApply(false); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); s_defaultToolbar = 0L; } @@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, @@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, @@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, @@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } KEditToolbarWidget::~KEditToolbarWidget() diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index bea8e78fe..61377830b 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser::tqsizeHint( void ) const +TQSize KFontChooser::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } diff --git a/tdeui/kfontdialog.h b/tdeui/kfontdialog.h index a4ce7e59b..bb6789837 100644 --- a/tdeui/kfontdialog.h +++ b/tdeui/kfontdialog.h @@ -252,7 +252,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: /** diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index d42f67e35..584780c8e 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -758,14 +758,14 @@ void KJanusWidget::setFocus() } -TQSize KJanusWidget::tqminimumSizeHint() const +TQSize KJanusWidget::minimumSizeHint() const { if( mFace == TreeList || mFace == IconList ) { TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 ); TQSize s2(0,0); TQSize s3(0,0); - TQSize s4( mPageStack->tqsizeHint() ); + TQSize s4( mPageStack->sizeHint() ); if( mFace == TreeList ) { @@ -781,7 +781,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const if( mTitleLabel->isVisible() ) { - s3 += mTitleLabel->tqsizeHint(); + s3 += mTitleLabel->sizeHint(); s3.rheight() += mTitleSep->tqminimumSize().height(); } @@ -795,7 +795,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const } else if( mFace == Tabbed ) { - return mTabControl->tqsizeHint(); + return mTabControl->sizeHint(); } else if( mFace == Swallow ) { @@ -803,7 +803,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const } else if( mFace == Plain ) { - return mPlainPage->tqsizeHint(); + return mPlainPage->sizeHint(); } else { @@ -813,9 +813,9 @@ TQSize KJanusWidget::tqminimumSizeHint() const } -TQSize KJanusWidget::tqsizeHint() const +TQSize KJanusWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e ) if( item ) { int lw = item->width( mIconList ); - int sw = mIconList->verticalScrollBar()->tqsizeHint().width(); + int sw = mIconList->verticalScrollBar()->sizeHint().width(); mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 ); } } @@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth() if( verticalScrollBar()->isVisible() ) { - maxWidth += verticalScrollBar()->tqsizeHint().width(); + maxWidth += verticalScrollBar()->sizeHint().width(); } setFixedWidth( maxWidth + frameWidth()*2 ); diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h index cbf42abca..4ddc8be17 100644 --- a/tdeui/kjanuswidget.h +++ b/tdeui/kjanuswidget.h @@ -55,7 +55,7 @@ class KGuiItem; * on the page, plain widget or the swallowed widget this will be taken care * of automatically. The size is used when the KJanusWidget determines its * own minimum size. You get the minimum size by using the - * tqminimumSizeHint() or tqsizeHint() methods. + * minimumSizeHint() or sizeHint() methods. * * Pages that have been added in TreeList, IconList or Tabbed mode can be * removed by simply deleting the page. However, it would be preferable to use @@ -186,7 +186,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget * * @return The minimum size. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Returns the recommended size for the widget in order to be displayed @@ -194,7 +194,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget * * @return The recommended size. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Returns the empty widget that is available in Plain mode. diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 27ae04c23..ee26cc6de 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut ) void KKeyButton::setText( const TQString& text ) { TQPushButton::setText( text ); - setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 ); + setFixedSize( sizeHint().width()+12, sizeHint().height()+8 ); } void KKeyButton::captureShortcut() diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 489f453ba..ceab2a0ad 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) ); - grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 ); + grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " "you can press the key-combination which you would like to be assigned " @@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category ) void KKeyChooser::fontChange( const TQFont & ) { - d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() ); + d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() ); int widget_width = 0; diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp index 0a2c532ed..b78b06a38 100644 --- a/tdeui/kled.cpp +++ b/tdeui/kled.cpp @@ -627,13 +627,13 @@ KLed::off() } TQSize -KLed::tqsizeHint() const +KLed::sizeHint() const { return TQSize(16, 16); } TQSize -KLed::tqminimumSizeHint() const +KLed::minimumSizeHint() const { return TQSize(16, 16 ); } diff --git a/tdeui/kled.h b/tdeui/kled.h index e945871ad..7ae03e196 100644 --- a/tdeui/kled.h +++ b/tdeui/kled.h @@ -249,8 +249,8 @@ public: */ void setLook( Look look ); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp index 2df4a14ad..9551fc1f6 100644 --- a/tdeui/klineeditdlg.cpp +++ b/tdeui/klineeditdlg.cpp @@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, topLayout->addWidget( label, 1 ); edit = new KLineEdit( plainPage(), 0L ); - edit->setMinimumWidth(edit->tqsizeHint().width() * 3); + edit->setMinimumWidth(edit->sizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); connect( edit, TQT_SIGNAL(textChanged(const TQString&)), @@ -75,7 +75,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, layout->addWidget(label, 0, 0, AlignLeft); edit = new KLineEdit( this, 0L ); - edit->setMinimumWidth(edit->tqsizeHint().width() * 3); + edit->setMinimumWidth(edit->sizeHint().width() * 3); connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); if ( _file_mode ) { diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index ffd16d0ef..e7d5469dc 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -1188,12 +1188,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) { case KToolBar::Top: case KToolBar::Bottom: - size += TQSize(0, tb->tqsizeHint().height()); + size += TQSize(0, tb->sizeHint().height()); break; case KToolBar::Left: case KToolBar::Right: - size += TQSize(toolBar()->tqsizeHint().width(), 0); + size += TQSize(toolBar()->sizeHint().width(), 0); break; case KToolBar::Flat: @@ -1212,7 +1212,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) } TQStatusBar *sb = internalStatusBar(); if( sb && !sb->isHidden() ) - size += TQSize(0, sb->tqsizeHint().height()); + size += TQSize(0, sb->sizeHint().height()); return size; } diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index d8aa59ff0..8fb99fb2e 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -452,7 +452,7 @@ public: * have been created and placed inside the main window (i.e. for 99% of * apps setCentralWidget()) * - Widgets that inherit from TQWidget (like game boards) should overload - * "virtual TQSize tqsizeHint() const;" to specify a default size rather + * "virtual TQSize sizeHint() const;" to specify a default size rather * than letting TQWidget::adjust use the default size of 0x0. */ void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"), @@ -657,10 +657,10 @@ public: * * @deprecated You normally don't need this, the recommended way to achieve a * certain central widget size is as follows: - * @li Override tqsizeHint() in the central widget so that it + * @li Override sizeHint() in the central widget so that it * returns the desired size. * @li Call updateGeometry() in the central widget whenever the - * desired size changes. This ensures that the new tqsizeHint() is properly + * desired size changes. This ensures that the new sizeHint() is properly * propagated to any parent layout. * @li Now call adjustSize() in the mainwindow to resize the * mainwindow such that the central widget will become the desired size. diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index f5d464216..b8f0f3326 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -394,7 +394,7 @@ void KMenuBar::checkSize( int& w, int& h ) { if( !d->topLevel || d->fallback_mode ) return; - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); w = s.width(); h = s.height(); // This is not done as setMinimumSize(), because that would set the minimum @@ -404,17 +404,17 @@ void KMenuBar::checkSize( int& w, int& h ) h = KMAX( h, d->min_size.height()); } -// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet -TQSize KMenuBar::tqsizeHint() const +// QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet +TQSize KMenuBar::sizeHint() const { if( !d->topLevel || block_resize > 0 ) - return TQMenuBar::tqsizeHint(); - // Since TQMenuBar::tqsizeHint() may indirectly call resize(), + return TQMenuBar::sizeHint(); + // Since TQMenuBar::sizeHint() may indirectly call resize(), // avoid infinite recursion. ++block_resize; // find the minimum useful height, and enlarge the width until the menu fits in that height (one row) int h = heightForWidth( 1000000 ); - int w = TQMenuBar::tqsizeHint().width(); + int w = TQMenuBar::sizeHint().width(); // optimization - don't call heightForWidth() too many times while( heightForWidth( w + 12 ) > h ) w += 12; @@ -448,7 +448,7 @@ bool KMenuBar::x11Event( XEvent* ev ) void KMenuBar::updateMenuBarSize() { menuContentsChanged(); // trigger invalidating calculated size - resize( tqsizeHint()); // and resize to preferred size + resize( sizeHint()); // and resize to preferred size } void KMenuBar::setFrameStyle( int style ) diff --git a/tdeui/kmenubar.h b/tdeui/kmenubar.h index 7509ff834..e657671e3 100644 --- a/tdeui/kmenubar.h +++ b/tdeui/kmenubar.h @@ -84,7 +84,7 @@ public: virtual void setFrameStyle( int ); virtual void setLineWidth( int ); virtual void setMargin( int ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected slots: void slotReadConfig(); protected: diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 87fa9d555..43284076c 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if ( details.length() < 512 ) { KActiveLabel *label3 = new KActiveLabel(qrichtextify(details), detailsGroup); - label3->setMinimumSize(label3->tqsizeHint()); + label3->setMinimumSize(label3->sizeHint()); if (!(options & KMessageBox::AllowLink)) { TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 3db1bcf2b..98df35c82 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -130,16 +130,16 @@ void KNumInput::layout(bool deep) int w1 = m_colw1; int w2 = m_colw2; - // label tqsizeHint - m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0)); + // label sizeHint + m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0)); if(m_label && (m_tqalignment & AlignVCenter)) m_colw1 = m_sizeLabel.width() + 4; else m_colw1 = 0; - // slider tqsizeHint - m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0)); + // slider sizeHint + m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0)); doLayout(); @@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KNumInput::tqsizeHint() const +TQSize KNumInput::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KNumInput::setSteps(int minor, int major) @@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark) m_spin->setEditFocus(mark); } -TQSize KIntNumInput::tqminimumSizeHint() const +TQSize KIntNumInput::minimumSizeHint() const { constPolish(); @@ -428,7 +428,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; + w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; if(m_tqalignment & (AlignTop|AlignBottom)) @@ -439,7 +439,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const void KIntNumInput::doLayout() { - m_sizeSpin = m_spin->tqsizeHint(); + m_sizeSpin = m_spin->sizeHint(); m_colw2 = m_sizeSpin.width(); if (m_label) @@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value ) emit relativeValueChanged( value / d->referencePoint ); } -TQSize KDoubleNumInput::tqminimumSizeHint() const +TQSize KDoubleNumInput::minimumSizeHint() const { constPolish(); @@ -669,7 +669,7 @@ TQSize KDoubleNumInput::tqminimumSizeHint() const // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; + w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; if(m_tqalignment & (AlignTop|AlignBottom)) @@ -719,7 +719,7 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) void KDoubleNumInput::doLayout() { - m_sizeEdit = d->spin->tqsizeHint(); + m_sizeEdit = d->spin->sizeHint(); m_colw2 = m_sizeEdit.width(); } diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h index 8f6b23910..c0a6d1847 100644 --- a/tdeui/knuminput.h +++ b/tdeui/knuminput.h @@ -117,7 +117,7 @@ public: * * @return the preferred size necessary to show the control */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: /** @@ -318,7 +318,7 @@ public: * * @return the minimum size necessary to show the control */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: /** @@ -599,7 +599,7 @@ public: void setSpecialValueText(const TQString& text); virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; virtual bool eventFilter(TQObject*, TQEvent*); public slots: diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index 15d49d9d5..79ba06dbd 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -136,7 +136,7 @@ public: * location in the Window Manager Dock. Please note that the size can not be larger than the * maxsize given by the handler. **/ - virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } + virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } /** * Always use this KConfig object to save/load your extensions configuration. diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index c10a1b673..025ecb19f 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -355,7 +355,7 @@ void KPasswordDialog::init() lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); lbl->tqsetAlignment(AlignHCenter|AlignVCenter); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); } @@ -373,7 +373,7 @@ void KPasswordDialog::init() lbl = new TQLabel(m_pMain); lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); TQHBoxLayout *h_lay = new TQHBoxLayout(); @@ -381,7 +381,7 @@ void KPasswordDialog::init() m_pEdit = new KPasswordEdit(m_pMain); m_pEdit2 = 0; lbl->setBuddy(m_pEdit); - TQSize size = m_pEdit->tqsizeHint(); + TQSize size = m_pEdit->sizeHint(); m_pEdit->setFixedHeight(size.height()); m_pEdit->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit); @@ -392,7 +392,7 @@ void KPasswordDialog::init() m_pGrid->addRowSpacing(8, 10); m_pGrid->setRowStretch(8, 12); TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain); - cb->setFixedSize(cb->tqsizeHint()); + cb->setFixedSize(cb->sizeHint()); if (m_Keep > 1) cb->setChecked(true); else @@ -404,14 +404,14 @@ void KPasswordDialog::init() lbl = new TQLabel(m_pMain); lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 9, 2); m_pEdit2 = new KPasswordEdit(m_pMain); lbl->setBuddy(m_pEdit2); - size = m_pEdit2->tqsizeHint(); + size = m_pEdit2->sizeHint(); m_pEdit2->setFixedHeight(size.height()); m_pEdit2->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit2); @@ -491,7 +491,7 @@ void KPasswordDialog::addLine(TQString key, TQString value) TQLabel *lbl = new TQLabel(key, m_pMain); lbl->tqsetAlignment(AlignLeft|AlignTop); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); lbl = new TQLabel(value, m_pMain); diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 01aadcb49..06bf8f0a3 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -194,8 +194,8 @@ void KPassivePopup::mouseReleaseEvent( TQMouseEvent *e ) void KPassivePopup::show() { - if ( size() != tqsizeHint() ) - resize( tqsizeHint() ); + if ( size() != sizeHint() ) + resize( sizeHint() ); if ( d->fixedPosition.isNull() ) positionSelf(); diff --git a/tdeui/kpopupmenu.cpp b/tdeui/kpopupmenu.cpp index 2e174422b..7ca5ea21f 100644 --- a/tdeui/kpopupmenu.cpp +++ b/tdeui/kpopupmenu.cpp @@ -115,7 +115,7 @@ void KPopupTitle::paintEvent(TQPaintEvent *) } } -TQSize KPopupTitle::tqsizeHint() const +TQSize KPopupTitle::sizeHint() const { return tqminimumSize(); } diff --git a/tdeui/kpopupmenu.h b/tdeui/kpopupmenu.h index 82f4ee20d..dfee4537b 100644 --- a/tdeui/kpopupmenu.h +++ b/tdeui/kpopupmenu.h @@ -74,7 +74,7 @@ public: */ TQPixmap icon() const { return miniicon; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: /// @since 3.1 diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index bb1deab52..aa2b62d49 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -408,7 +408,7 @@ KSpellConfig::fillInDialog () if ( dictFromList() ) whichelement = langfnames.findIndex(dictionary()); - dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width()); + dictcombo->setMinimumWidth (dictcombo->sizeHint().width()); if (dictionary().isEmpty() || whichelement!=-1) { diff --git a/tdeui/kselect.h b/tdeui/kselect.h index b9ab92fd9..cc011dcfe 100644 --- a/tdeui/kselect.h +++ b/tdeui/kselect.h @@ -352,7 +352,7 @@ protected: virtual void drawContents( TQPainter * ); virtual TQSize tqminimumSize() const - { return tqsizeHint(); } + { return sizeHint(); } private: void init(); diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp index 29ca5e83a..07d143266 100644 --- a/tdeui/kseparator.cpp +++ b/tdeui/kseparator.cpp @@ -100,7 +100,7 @@ void KSeparator::drawFrame(TQPainter *p) } -TQSize KSeparator::tqsizeHint() const +TQSize KSeparator::sizeHint() const { if ( frameStyle() & VLine ) return TQSize(2, 0); diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h index 17ff7253a..cac498d0a 100644 --- a/tdeui/kseparator.h +++ b/tdeui/kseparator.h @@ -70,7 +70,7 @@ class TDEUI_EXPORT KSeparator : public TQFrame /** * The recommended height (width) for a horizontal (vertical) separator. **/ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: /** diff --git a/tdeui/kshortcutdialog_advanced.ui b/tdeui/kshortcutdialog_advanced.ui index 7caa7f9ed..6466174d2 100644 --- a/tdeui/kshortcutdialog_advanced.ui +++ b/tdeui/kshortcutdialog_advanced.ui @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/tdeui/kshortcutdialog_simple.ui b/tdeui/kshortcutdialog_simple.ui index 8e43d618f..97d87b582 100644 --- a/tdeui/kshortcutdialog_simple.ui +++ b/tdeui/kshortcutdialog_simple.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/tdeui/kspelldlg.cpp b/tdeui/kspelldlg.cpp index fe428aad7..d21b6975e 100644 --- a/tdeui/kspelldlg.cpp +++ b/tdeui/kspelldlg.cpp @@ -100,7 +100,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b TQT_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "kspell" ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); emit ready( false ); } diff --git a/tdeui/kspellui.ui b/tdeui/kspellui.ui index 2477e373e..18b755117 100644 --- a/tdeui/kspellui.ui +++ b/tdeui/kspellui.ui @@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -276,7 +276,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/tdeui/ksqueezedtextlabel.cpp b/tdeui/ksqueezedtextlabel.cpp index 42d6776b9..2d24a34c8 100644 --- a/tdeui/ksqueezedtextlabel.cpp +++ b/tdeui/ksqueezedtextlabel.cpp @@ -36,16 +36,16 @@ void KSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KSqueezedTextLabel::tqminimumSizeHint() const +TQSize KSqueezedTextLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KSqueezedTextLabel::tqsizeHint() const +TQSize KSqueezedTextLabel::sizeHint() const { - return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); } void KSqueezedTextLabel::setText( const TQString &text ) { diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h index f8c11b197..512e9e4de 100644 --- a/tdeui/ksqueezedtextlabel.h +++ b/tdeui/ksqueezedtextlabel.h @@ -53,8 +53,8 @@ public: KSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp index 5ec13f20e..204a0979e 100644 --- a/tdeui/ktabctl.cpp +++ b/tdeui/ktabctl.cpp @@ -125,7 +125,7 @@ void KTabCtl::setSizes() { unsigned i; - TQSize min(tabs->tqsizeHint()); /* the minimum required size for the tabbar */ + TQSize min(tabs->sizeHint()); /* the minimum required size for the tabbar */ tabs->resize(min); /* make sure that the tabbar does not require more space than actually needed. */ @@ -190,16 +190,16 @@ void KTabCtl::setShape( TQTabBar::Shape tqshape ) } TQSize -KTabCtl::tqsizeHint() const +KTabCtl::sizeHint() const { /* desired size of the tabbar */ - TQSize hint(tabs->tqsizeHint()); + TQSize hint(tabs->sizeHint()); /* overall desired size of all pages */ TQSize pageHint; for (unsigned int i = 0; i < pages.size(); i++) { - TQSize sizeI(pages[i]->tqsizeHint()); + TQSize sizeI(pages[i]->sizeHint()); if (sizeI.isValid()) { @@ -229,7 +229,7 @@ KTabCtl::tqsizeHint() const } /* - * If not at least a one page has a valid tqsizeHint we have to return + * If not at least a one page has a valid sizeHint we have to return * an invalid size as well. */ return (pageHint); diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h index b24ea8896..d18da9750 100644 --- a/tdeui/ktabctl.h +++ b/tdeui/ktabctl.h @@ -62,7 +62,7 @@ public: void setTabEnabled(const TQString&, bool); void setBorder(bool); void setShape( TQTabBar::Shape tqshape ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 3825d5aa5..36410921e 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -253,7 +253,7 @@ void KTabWidget::resizeTabs( int changeTabIndex ) newMaxLength=d->m_maxLength; uint lcw=0, rcw=0; - int tabBarHeight = tabBar()->tqsizeHint().height(); + int tabBarHeight = tabBar()->sizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) @@ -451,7 +451,7 @@ void KTabWidget::removePage( TQWidget * w ) { bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const { - TQSize size( tabBar()->tqsizeHint() ); + TQSize size( tabBar()->sizeHint() ); if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) { TQWidget *rightcorner = cornerWidget( TopRight ); if ( rightcorner ) { diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index b3c383c4d..ee531e102 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -181,7 +181,7 @@ void KToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize KToolBarSeparator::tqsizeHint() const +TQSize KToolBarSeparator::sizeHint() const { int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); @@ -1240,7 +1240,7 @@ void KToolBar::rebuildLayout() continue; KToolBarSeparator *ktbs = tqt_dynamic_cast<KToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { - l->addSpacing( orientation() == Qt::Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() ); + l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); w->hide(); continue; } @@ -1343,7 +1343,7 @@ TQSizePolicy KToolBar::sizePolicy() const return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); } -TQSize KToolBar::tqsizeHint() const +TQSize KToolBar::sizeHint() const { TQSize minSize(0,0); KToolBar *ncThis = const_cast<KToolBar *>(this); @@ -1357,7 +1357,7 @@ TQSize KToolBar::tqsizeHint() const case KToolBar::Bottom: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->tqsizeHint(); + TQSize sh = w->sizeHint(); if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) @@ -1379,7 +1379,7 @@ TQSize KToolBar::tqsizeHint() const case KToolBar::Right: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->tqsizeHint(); + TQSize sh = w->sizeHint(); if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) @@ -1395,7 +1395,7 @@ TQSize KToolBar::tqsizeHint() const break; default: - minSize = TQToolBar::tqsizeHint(); + minSize = TQToolBar::sizeHint(); break; } return minSize; @@ -1403,12 +1403,12 @@ TQSize KToolBar::tqsizeHint() const TQSize KToolBar::tqminimumSize() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KToolBar::tqminimumSizeHint() const +TQSize KToolBar::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } bool KToolBar::highlight() const diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index 918ce00a4..96d0872bc 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -62,7 +62,7 @@ class TDEUI_EXPORT KToolBarSeparator : public TQFrame public: KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Orientation orientation() const { return orient; } TQSizePolicy sizePolicy() const; bool showLine() const { return line; } @@ -945,8 +945,8 @@ public: void setStretchableWidget( TQWidget *w ); TQSizePolicy sizePolicy() const; bool highlight() const; - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; TQSize tqminimumSize() const; void hide(); diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 7df04fa70..b7801a2f8 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -734,12 +734,12 @@ void KToolBarButton::setToggle(bool flag) disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); } -TQSize KToolBarButton::tqsizeHint() const +TQSize KToolBarButton::sizeHint() const { return d->size; } -TQSize KToolBarButton::tqminimumSizeHint() const +TQSize KToolBarButton::minimumSizeHint() const { return d->size; } diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h index 5af5c1b1c..9f02a1f6b 100644 --- a/tdeui/ktoolbarbutton.h +++ b/tdeui/ktoolbarbutton.h @@ -292,8 +292,8 @@ protected: /// @since 3.4 void mouseReleaseEvent( TQMouseEvent * ); void showMenu(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; TQSize tqminimumSize() const; /// @since 3.1 diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 769625a8c..e0ce2166b 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -1332,7 +1332,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) // L2500: Specifies that this widget can use additional space, -// and that it can survive on less than tqsizeHint(). +// and that it can survive on less than sizeHint(). TQSizePolicy QXEmbed::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -1340,13 +1340,13 @@ TQSizePolicy QXEmbed::sizePolicy() const // L2520: Returns a size sufficient for the embedded window -TQSize QXEmbed::tqsizeHint() const +TQSize QXEmbed::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } // L2550: Returns the minimum size specified by the embedded window. -TQSize QXEmbed::tqminimumSizeHint() const +TQSize QXEmbed::minimumSizeHint() const { int minw = 0; int minh = 0; diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h index 03ebff8e6..c780e829c 100644 --- a/tdeui/qxembed.h +++ b/tdeui/qxembed.h @@ -188,8 +188,8 @@ public: bool autoDelete() const; /* Reimp */ - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; TQSizePolicy sizePolicy() const; bool eventFilter( TQObject *, TQEvent * ); bool customWhatsThis() const; diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index 86850f0ce..75295079f 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -38,7 +38,7 @@ int main(int argc, char **argv) { "Press OK or Cancel when done" , w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); @@ -66,7 +66,7 @@ int main(int argc, char **argv) { "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -92,7 +92,7 @@ int main(int argc, char **argv) { "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -121,7 +121,7 @@ int main(int argc, char **argv) { "since it will look ugly -- " "anyway, it works", w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -153,7 +153,7 @@ int main(int argc, char **argv) { "the former example!" ,w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -183,7 +183,7 @@ int main(int argc, char **argv) { "too?" ,w); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp index 5880c436a..facd17bca 100644 --- a/tdeui/tests/kcharselecttest.cpp +++ b/tdeui/tests/kcharselecttest.cpp @@ -7,7 +7,7 @@ int main (int argc,char **argv) KApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); - selector.resize( selector.tqsizeHint() ); + selector.resize( selector.sizeHint() ); selector.show(); selector.setCaption( "KCharSelect Test" ); diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 507030132..942d52f8d 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -23,7 +23,7 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) layout->addWidget(colorBtn, 0); layout->addWidget(lbl, 1); layout->activate(); - resize(tqsizeHint()); + resize(sizeHint()); } void KDualColorWidget::slotFgChanged(const TQColor &c) diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp index e63d24fca..31f8f1735 100644 --- a/tdeui/tests/kmessageboxtest.cpp +++ b/tdeui/tests/kmessageboxtest.cpp @@ -25,18 +25,18 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) // and sub-layouts. TQSize sh; setText("<p>Hello.</p>"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("Hello."); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("<p>Hello<br>World</p>"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); // setText("Hello\nWorld"); - sh = tqsizeHint(); + sh = sizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index e081e467f..6f2d8f2be 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) init(); setText("We added \"Client Test\" to kicker. Click the K Menu to check."); - resize(tqsizeHint()); + resize(sizeHint()); } void TestWidget::init() diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 8d64a53f4..ad2f5630a 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name ) beginMark = new KIntNumInput(0, lineEdit); beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); - beginMark->setFixedSize(beginMark->tqsizeHint()); + beginMark->setFixedSize(beginMark->sizeHint()); connect(beginMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotNewOffset(int)) ); connect(beginMark, TQT_SIGNAL(valueChanged(int)), @@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name ) endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); - endMark->setFixedSize(endMark->tqsizeHint()); + endMark->setFixedSize(endMark->sizeHint()); connect(endMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(endMark, TQT_SIGNAL(valueChanged(int)), @@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name ) lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); - lengthInput->setFixedSize(lengthInput->tqsizeHint()); + lengthInput->setFixedSize(lengthInput->sizeHint()); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), @@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name ) transX = new KDoubleNumInput(0.0, vertrot); transX->setRange(-1000, 1000, 1, false); transX->move(5, 15); - transX->setFixedSize(transX->tqsizeHint()); + transX->setFixedSize(transX->sizeHint()); //transX->setLabel("transx", AlignLeft); connect(transX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); - transY->setFixedSize(transY->tqsizeHint()); + transY->setFixedSize(transY->sizeHint()); //transY->setLabel("transy", AlignLeft); connect(transY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); - rotV->setFixedSize(rotV->tqsizeHint()); + rotV->setFixedSize(rotV->sizeHint()); //rotV->setLabel("rot", AlignLeft); connect(rotV, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetRotate(double)) ); |