From d4e11a5f488204ab8886e167c7c4af1e6e16ab58 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 23:54:16 -0600 Subject: Use non-tq sizeHint functions to fix bindings --- kio/kfile/kfiledialog.cpp | 2 +- kio/kfile/kfilemetapreview.cpp | 2 +- kio/kfile/kfilepreview.cpp | 6 +++--- kio/kfile/kfilespeedbar.cpp | 10 +++++----- kio/kfile/kfilespeedbar.h | 2 +- kio/kfile/kicondialog.cpp | 2 +- kio/kfile/kimagefilepreview.cpp | 2 +- kio/kfile/kimagefilepreview.h | 2 +- kio/kfile/kmetaprops.cpp | 4 ++-- kio/kfile/knotifywidgetbase.ui | 8 ++++---- kio/kfile/kopenwith.cpp | 4 ++-- kio/kfile/kpropertiesdesktopadvbase.ui | 6 +++--- kio/kfile/kpropertiesdesktopbase.ui | 6 +++--- kio/kfile/kpropertiesdialog.cpp | 14 +++++++------- kio/kfile/kurlbar.cpp | 28 ++++++++++++++-------------- kio/kfile/kurlbar.h | 6 +++--- kio/kfile/kurlrequesterdlg.cpp | 2 +- kio/kio/defaultprogress.cpp | 4 ++-- kio/kio/passdlg.cpp | 18 +++++++++--------- kio/kio/renamedlg.cpp | 2 +- kio/kio/skipdlg.cpp | 12 ++++++------ kio/kio/statusbarprogress.cpp | 2 +- kio/kssl/ksslinfodlg.cc | 2 +- kio/misc/kwalletd/kbetterthankdialogbase.ui | 4 ++-- kio/misc/kwalletd/kwalletwizard.ui | 18 +++++++++--------- kio/tests/kdirlistertest.cpp | 2 +- kio/tests/kioslavetest.cpp | 10 +++++----- 27 files changed, 90 insertions(+), 90 deletions(-) (limited to 'kio') diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index a1668693d..fbc6dd7ab 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1738,7 +1738,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) updateAutoSelectExtension (); int w1 = tqminimumSize().width(); - int w2 = toolbar->tqsizeHint().width() + 10; + int w2 = toolbar->sizeHint().width() + 10; if (w1 < w2) setMinimumWidth(w2); diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 3c73387b4..c8b89b5d6 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders() KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); (void) m_stack->addWidget( imagePreview ); m_stack->raiseWidget( imagePreview ); - resize( imagePreview->tqsizeHint() ); + resize( imagePreview->sizeHint() ); TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList::ConstIterator it = mimeTypes.begin(); diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index 8ce3e87af..877260a5f 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view ) preview = new TQWidget((TQSplitter*)this, "preview"); TQString tmp = i18n("No preview available."); TQLabel *l = new TQLabel(tmp, preview); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); l->move(10, 5); - preview->setMinimumWidth(l->tqsizeHint().width()+20); + preview->setMinimumWidth(l->sizeHint().width()+20); setResizeMode(preview, TQSplitter::KeepSize); // Why copy the actions? --ellis, 13 Jan 02. @@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) delete preview; preview = const_cast(w); preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); preview->show(); } diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index c3449ca9b..154009625 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config ) writeConfig( config, "KFileDialog Speedbar" ); } -TQSize KFileSpeedBar::tqsizeHint() const +TQSize KFileSpeedBar::sizeHint() const { - TQSize tqsizeHint = KURLBar::tqsizeHint(); + TQSize sizeHint = KURLBar::sizeHint(); int ems = fontMetrics().width("mmmmmmmmmmmm"); - if (tqsizeHint.width() < ems) + if (sizeHint.width() < ems) { - tqsizeHint.setWidth(ems); + sizeHint.setWidth(ems); } - return tqsizeHint; + return sizeHint; } #include "kfilespeedbar.moc" diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 171081101..28c621651 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -31,7 +31,7 @@ public: ~KFileSpeedBar(); virtual void save( KConfig *config ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: bool m_initializeSpeedbar : 1; diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index e600f2679..150536a33 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -367,7 +367,7 @@ void KIconDialog::init() mContextMap[ mNumContext++ ] = context_id[ i ]; } } - mpCombo->setFixedSize(mpCombo->tqsizeHint()); + mpCombo->setFixedSize(mpCombo->sizeHint()); mpBrowseBut->setFixedWidth(mpCombo->width()); diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index f2869314c..16cef138d 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * ) timer->start( 100, true ); // forces a new preview } -TQSize KImageFilePreview::tqsizeHint() const +TQSize KImageFilePreview::sizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 3e64f2a7b..864fc5d31 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase KImageFilePreview(TQWidget *parent); ~KImageFilePreview(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void showPreview(const KURL &url); diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index 38906bbd3..1b85cbab0 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -56,8 +56,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), - kMax(m_frame->tqsizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), + kMax(m_frame->sizeHint().height(), ev->size().height())); }; private: diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui index c2ce7ab68..d3c3103ff 100644 --- a/kio/kfile/knotifywidgetbase.ui +++ b/kio/kfile/knotifywidgetbase.ui @@ -138,7 +138,7 @@ Fixed - + 30 20 @@ -155,7 +155,7 @@ Expanding - + 318 16 @@ -286,7 +286,7 @@ Fixed - + 30 20 @@ -391,7 +391,7 @@ Expanding - + 20 0 diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index e5754cefb..0b32bc684 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); - clearButton->setFixedSize( clearButton->tqsizeHint() ); + clearButton->setFixedSize( clearButton->sizeHint() ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); @@ -518,7 +518,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) //edit->setText( _value ); // This is what caused "can't click on items before clicking on Name header". // Probably due to the resizeEvent handler using width(). - //resize( minimumWidth(), tqsizeHint().height() ); + //resize( minimumWidth(), sizeHint().height() ); edit->setFocus(); slotTextChanged(); } diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui index a4ac75d4f..fd8e39781 100644 --- a/kio/kfile/kpropertiesdesktopadvbase.ui +++ b/kio/kfile/kpropertiesdesktopadvbase.ui @@ -41,7 +41,7 @@ Minimum - + 20 20 @@ -120,7 +120,7 @@ Minimum - + 20 20 @@ -230,7 +230,7 @@ Expanding - + 50 20 diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui index 73e6d953c..a0894dc70 100644 --- a/kio/kfile/kpropertiesdesktopbase.ui +++ b/kio/kfile/kpropertiesdesktopbase.ui @@ -29,7 +29,7 @@ Minimum - + 20 16 @@ -259,7 +259,7 @@ Following the command, you can have several place holders which will be replaced MinimumExpanding - + 53 20 @@ -287,7 +287,7 @@ Following the command, you can have several place holders which will be replaced MinimumExpanding - + 53 20 diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index a3c1739ad..6496b2cdb 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQWhatsThis::add(l, execWhatsThis); theNotSpecials.append( l ); // GJ: Add space between normal and special modes - TQSize size = l->tqsizeHint(); + TQSize size = l->sizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget (l, 1, 3); @@ -2685,35 +2685,35 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); mainlayout->addWidget(tmpQLabel, 1); //patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setText( "" ); patternEdit->setMaxLength( 512 ); - patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); + patternEdit->setMinimumSize( patternEdit->sizeHint() ); patternEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(patternEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel->setText( i18n("Mime Type") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); mainlayout->addWidget(tmpQLabel, 1); //mimeEdit->setGeometry( 10, 160, 210, 30 ); mimeEdit->setMaxLength( 256 ); - mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); + mimeEdit->setMinimumSize( mimeEdit->sizeHint() ); mimeEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(mimeEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel->setText( i18n("Comment") ); - tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); mainlayout->addWidget(tmpQLabel, 1); //commentEdit->setGeometry( 10, 100, 210, 30 ); commentEdit->setMaxLength( 256 ); - commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); + commentEdit->setMinimumSize( commentEdit->sizeHint() ); commentEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(commentEdit, 1); diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 218a72f37..ca5359f38 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p ) } } -TQSize KURLBarItem::tqsizeHint() const +TQSize KURLBarItem::sizeHint() const { int wmin = 0; int hmin = 0; @@ -284,9 +284,9 @@ TQSize KURLBarItem::tqsizeHint() const } if ( lb->isVertical() ) - wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); + wmin = QMIN( wmin, lb->viewport()->sizeHint().width() ); else - hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); + hmin = QMIN( hmin, lb->viewport()->sizeHint().height() ); return TQSize( wmin, hmin ); } @@ -294,17 +294,17 @@ TQSize KURLBarItem::tqsizeHint() const int KURLBarItem::width( const TQListBox *lb ) const { if ( static_cast( lb )->isVertical() ) - return QMAX( tqsizeHint().width(), lb->viewport()->width() ); + return QMAX( sizeHint().width(), lb->viewport()->width() ); else - return tqsizeHint().width(); + return sizeHint().width(); } int KURLBarItem::height( const TQListBox *lb ) const { if ( static_cast( lb )->isVertical() ) - return tqsizeHint().height(); + return sizeHint().height(); else - return QMAX( tqsizeHint().height(), lb->viewport()->height() ); + return QMAX( sizeHint().height(), lb->viewport()->height() ); } bool KURLBarItem::isPersistent() const @@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size ) item = static_cast( item->next() ); } - resize( tqsizeHint() ); + resize( sizeHint() ); updateGeometry(); } @@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & ) setPalette( pal ); } -TQSize KURLBar::tqsizeHint() const +TQSize KURLBar::sizeHint() const { - return m_listBox->tqsizeHint(); + return m_listBox->sizeHint(); #if 0 // this code causes vertical and or horizontal scrollbars appearing // depending on the text, font, moonphase and earth rotation. Just using - // m_listBox->tqsizeHint() fixes this (although the widget can then be + // m_listBox->sizeHint() fixes this (although the widget can then be // resized to a smaller size so that scrollbars appear). int w = 0; int h = 0; @@ -484,7 +484,7 @@ TQSize KURLBar::tqsizeHint() const item; item = static_cast( item->next() ) ) { - TQSize sh = item->tqsizeHint(); + TQSize sh = item->sizeHint(); if ( vertical ) { w = QMAX( w, sh.width() ); @@ -508,9 +508,9 @@ TQSize KURLBar::tqsizeHint() const #endif } -TQSize KURLBar::tqminimumSizeHint() const +TQSize KURLBar::minimumSizeHint() const { - TQSize s = tqsizeHint(); // ### + TQSize s = sizeHint(); // ### int w = s.width() + m_listBox->verticalScrollBar()->width(); int h = s.height() + m_listBox->horizontalScrollBar()->height(); return TQSize( w, h ); diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 32969cff7..29a73ff34 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -109,7 +109,7 @@ public: * returns the preferred size of this item * @since 3.1 */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * returns the width of this item. @@ -319,12 +319,12 @@ public: * @returns a proper sizehint, depending on the orientation and the number * of items available. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * @returns a proper minimum size (reimplemented) */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Call this method to read a saved configuration from @p config, diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp index defa09264..19409afdc 100644 --- a/kio/kfile/kurlrequesterdlg.cpp +++ b/kio/kfile/kurlrequesterdlg.cpp @@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) topLayout->addWidget( label ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); - urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 76a88bccf..eb0b65483 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -171,8 +171,8 @@ void DefaultProgress::init() connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); - resize( tqsizeHint() ); - setMaximumHeight(tqsizeHint().height()); + resize( sizeHint() ); + setMaximumHeight(sizeHint().height()); d->keepOpenChecked = false; d->noCaptionYet = true; diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 3b2a1058f..0ea88b873 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -88,7 +88,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, lbl = new TQLabel( main ); lbl->setPixmap( pix ); lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter ); - lbl->setFixedSize( lbl->tqsizeHint() ); + lbl->setFixedSize( lbl->sizeHint() ); d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); } d->prompt = new TQLabel( main ); @@ -107,11 +107,11 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() ); + d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); d->userNameHBox = new TQHBox( main ); d->userEdit = new KLineEdit( d->userNameHBox ); - TQSize s = d->userEdit->tqsizeHint(); + TQSize s = d->userEdit->sizeHint(); d->userEdit->setFixedHeight( s.height() ); d->userEdit->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEdit ); @@ -124,14 +124,14 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - lbl->setFixedSize( lbl->tqsizeHint() ); + lbl->setFixedSize( lbl->sizeHint() ); TQHBox* hbox = new TQHBox( main ); d->passEdit = new KLineEdit( hbox ); if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" ) d->passEdit->setEchoMode( TQLineEdit::NoEcho ); else d->passEdit->setEchoMode( TQLineEdit::Password ); - s = d->passEdit->tqsizeHint(); + s = d->passEdit->sizeHint(); d->passEdit->setFixedHeight( s.height() ); d->passEdit->setMinimumWidth( s.width() ); lbl->setBuddy( d->passEdit ); @@ -145,7 +145,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 8: Keep Password hbox = new TQHBox( main ); d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox ); - d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() ); + d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); @@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->userEdit->setFocus(); d->userEditCombo = 0; -// setFixedSize( tqsizeHint() ); +// setFixedSize( sizeHint() ); } TQString PasswordDialog::username() const @@ -240,7 +240,7 @@ void PasswordDialog::addCommentLine( const TQString& label, TQLabel* lbl = new TQLabel( label, main); lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight ); - lbl->setFixedSize( lbl->tqsizeHint() ); + lbl->setFixedSize( lbl->sizeHint() ); d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); lbl = new TQLabel( comment, main); lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); @@ -304,7 +304,7 @@ void PasswordDialog::setKnownLogins( const TQMap& knownLogin delete d->userEdit; d->userEditCombo = new KComboBox( true, d->userNameHBox ); d->userEdit = d->userEditCombo->lineEdit(); - TQSize s = d->userEditCombo->tqsizeHint(); + TQSize s = d->userEditCombo->sizeHint(); d->userEditCombo->setFixedHeight( s.height() ); d->userEditCombo->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEditCombo ); diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index bc9e3b96d..722f2874b 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -380,7 +380,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, d->bCancel->setDefault( true ); layout->addWidget( d->bCancel ); - resize( tqsizeHint() ); + resize( sizeHint() ); } RenameDlg::~RenameDlg() diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index ceb48b550..0fe7b230b 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -71,8 +71,8 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo // vlayout->addStrut( 360 ); makes dlg at least that wide TQLabel * lb = new TQLabel( _error_text, this ); - lb->setFixedHeight( lb->tqsizeHint().height() ); - lb->setMinimumWidth( lb->tqsizeHint().width() ); + lb->setFixedHeight( lb->sizeHint().height() ); + lb->setMinimumWidth( lb->sizeHint().width() ); vlayout->addWidget( lb ); vlayout->addSpacing( 10 ); @@ -82,26 +82,26 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo if ( b0 ) { b0->setDefault( true ); - b0->setFixedSize( b0->tqsizeHint() ); + b0->setFixedSize( b0->sizeHint() ); layout->addWidget( b0 ); layout->addSpacing( 5 ); } if ( b1 ) { - b1->setFixedSize( b1->tqsizeHint() ); + b1->setFixedSize( b1->sizeHint() ); layout->addWidget( b1 ); layout->addSpacing( 5 ); } if ( b2 ) { - b2->setFixedSize( b2->tqsizeHint() ); + b2->setFixedSize( b2->sizeHint() ); layout->addWidget( b2 ); layout->addSpacing( 5 ); } vlayout->addStretch( 10 ); vlayout->activate(); - resize( tqsizeHint() ); + resize( sizeHint() ); } SkipDlg::~SkipDlg() diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp index a3fdbf9c2..3f52ed889 100644 --- a/kio/kio/statusbarprogress.cpp +++ b/kio/kio/statusbarprogress.cpp @@ -64,7 +64,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); mode = None; setMode(); diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index fa0655a46..de57d78c0 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { } d->_csl->setText(errorStr); - d->_csl->setMinimumSize(d->_csl->tqsizeHint()); + d->_csl->setMinimumSize(d->_csl->sizeHint()); d->_subject->setValues(x->getSubject()); d->_issuer->setValues(x->getIssuer()); diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui index 60b75da28..a02d5def7 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui @@ -37,7 +37,7 @@ Expanding - + 41 21 @@ -99,7 +99,7 @@ Expanding - + 61 21 diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index 809993077..6f94e5643 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -36,7 +36,7 @@ Expanding - + 21 21 @@ -135,7 +135,7 @@ Expanding - + 140 21 @@ -152,7 +152,7 @@ Expanding - + 140 31 @@ -311,7 +311,7 @@ Expanding - + 21 51 @@ -328,7 +328,7 @@ Expanding - + 101 21 @@ -345,7 +345,7 @@ Expanding - + 111 31 @@ -362,7 +362,7 @@ Expanding - + 21 70 @@ -417,7 +417,7 @@ Expanding - + 21 121 @@ -450,7 +450,7 @@ Expanding - + 21 51 diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 8acef5b24..6137f5e71 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -47,7 +47,7 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( startR ); layout->addWidget( startT ); layout->addWidget( test ); - resize( layout->tqsizeHint() ); + resize( layout->sizeHint() ); connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 5689aaae9..0db23457d 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -144,24 +144,24 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) hbLayout = new TQHBoxLayout( topLayout, 15 ); pbStart = new TQPushButton( "&Start", main_widget ); - pbStart->setFixedSize( pbStart->tqsizeHint() ); + pbStart->setFixedSize( pbStart->sizeHint() ); connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); - pbStop->setFixedSize( pbStop->tqsizeHint() ); + pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); - close->setFixedSize( close->tqsizeHint() ); + close->setFixedSize( close->sizeHint() ); connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); - main_widget->setMinimumSize( main_widget->tqsizeHint() ); + main_widget->setMinimumSize( main_widget->sizeHint() ); setCentralWidget( main_widget ); slave = 0; @@ -545,7 +545,7 @@ int main(int argc, char **argv) { KioslaveTest test( src, dest, op, pr ); test.show(); // Bug in KTMW / Qt / layouts ? - test.resize( test.tqsizeHint() ); + test.resize( test.sizeHint() ); app.setMainWidget(&test); app.exec(); -- cgit v1.2.1