summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
commit33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd (patch)
tree4939d6567b50d0dd669257422a6868aa1259e62b /tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
parentf01eee0362e54f47d0266295c5263790c04b6510 (diff)
downloadexperimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.tar.gz
experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.zip
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp')
-rw-r--r--tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp b/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
index a6f04b6..74bf69f 100644
--- a/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
+++ b/tqtinterface/qt4/src/dialogs/tqprogressdialog.cpp
@@ -358,8 +358,8 @@ void TQProgressDialog::setLabel( TQLabel *label )
label->reparent( this, 0, TQPoint(0,0), FALSE );
}
}
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
if (label)
label->show();
@@ -384,8 +384,8 @@ void TQProgressDialog::setLabelText( const TQString &text )
{
if ( label() ) {
label()->setText( text );
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
}
}
@@ -417,8 +417,8 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton )
d->cancel, TQT_SIGNAL(clicked()) );
#endif
}
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
if (cancelButton)
cancelButton->show();
@@ -439,8 +439,8 @@ void TQProgressDialog::setCancelButtonText( const TQString &cancelButtonText )
} else {
setCancelButton(0);
}
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
}
@@ -462,8 +462,8 @@ void TQProgressDialog::setBar( TQProgressBar *bar )
}
delete d->bar;
d->bar = bar;
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
}
@@ -610,8 +610,8 @@ void TQProgressDialog::setProgress( int progress )
}
}
if ( need_show ) {
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
show();
d->shown_once = TRUE;
@@ -647,13 +647,13 @@ void TQProgressDialog::setProgress( int progress, int totalSteps )
need to call this yourself.
*/
-TQSize TQProgressDialog::sizeHint() const
+TQSize TQProgressDialog::tqsizeHint() const
{
- TQSize sh = label()->sizeHint();
- TQSize bh = bar()->sizeHint();
+ TQSize sh = label()->tqsizeHint();
+ TQSize bh = bar()->tqsizeHint();
int h = margin_tb*2 + bh.height() + sh.height() + spacing;
if ( d->cancel )
- h += d->cancel->sizeHint().height() + spacing;
+ h += d->cancel->tqsizeHint().height() + spacing;
return TQSize( TQMAX(200, sh.width() + 2*margin_lr), h );
}
@@ -681,8 +681,8 @@ void TQProgressDialog::tqlayout()
const bool centered =
bool(tqstyle().tqstyleHint(TQStyle::SH_ProgressDialog_CenterCancelButton, this));
- TQSize cs = d->cancel ? d->cancel->sizeHint() : TQSize(0,0);
- TQSize bh = bar()->sizeHint();
+ TQSize cs = d->cancel ? d->cancel->tqsizeHint() : TQSize(0,0);
+ TQSize bh = bar()->tqsizeHint();
int cspc;
int lh = 0;
@@ -800,8 +800,8 @@ bool TQProgressDialog::autoClose() const
void TQProgressDialog::showEvent( TQShowEvent *e )
{
TQDialog::showEvent( e );
- int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
forceTimer->stop();
}