summaryrefslogtreecommitdiffstats
path: root/src/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/qdialog.cpp6
-rw-r--r--src/dialogs/qfiledialog.cpp16
-rw-r--r--src/dialogs/qprogressdialog.cpp2
3 files changed, 13 insertions, 11 deletions
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 4f40ded28..095cbf2e7 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -1077,13 +1077,14 @@ void TQDialog::showExtension( bool showIt )
/*! \reimp */
TQSize TQDialog::sizeHint() const
{
- if ( d->extension )
+ if ( d->extension ) {
if ( d->orientation == Horizontal )
return TQSize( TQWidget::sizeHint().width(),
TQMAX( TQWidget::sizeHint().height(),d->extension->sizeHint().height() ) );
else
return TQSize( TQMAX( TQWidget::sizeHint().width(), d->extension->sizeHint().width() ),
TQWidget::sizeHint().height() );
+ }
return TQWidget::sizeHint();
}
@@ -1092,13 +1093,14 @@ TQSize TQDialog::sizeHint() const
/*! \reimp */
TQSize TQDialog::minimumSizeHint() const
{
- if ( d->extension )
+ if ( d->extension ) {
if (d->orientation == Horizontal )
return TQSize( TQWidget::minimumSizeHint().width(),
TQMAX( TQWidget::minimumSizeHint().height(), d->extension->minimumSizeHint().height() ) );
else
return TQSize( TQMAX( TQWidget::minimumSizeHint().width(), d->extension->minimumSizeHint().width() ),
TQWidget::minimumSizeHint().height() );
+ }
return TQWidget::minimumSizeHint();
}
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index e624545f5..e268ba1bb 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -1453,7 +1453,7 @@ void TQFileListBox::viewportDropEvent( TQDropEvent *e )
bool TQFileListBox::acceptDrop( const TQPoint &pnt, TQWidget *source )
{
TQListBoxItem *item = itemAt( pnt );
- if ( !item || item && !itemRect( item ).contains( pnt ) ) {
+ if ( !item || ( item && !itemRect( item ).contains( pnt ) ) ) {
if ( source == viewport() && startDragDir == filedialog->dirPath() )
return FALSE;
return TRUE;
@@ -1872,7 +1872,7 @@ void TQFileDialogTQFileListView::viewportDropEvent( TQDropEvent *e )
bool TQFileDialogTQFileListView::acceptDrop( const TQPoint &pnt, TQWidget *source )
{
TQListViewItem *item = itemAt( pnt );
- if ( !item || item && !itemRect( item ).contains( pnt ) ) {
+ if ( !item || ( item && !itemRect( item ).contains( pnt ) ) ) {
if ( source == viewport() && startDragDir == filedialog->dirPath() )
return FALSE;
return TRUE;
@@ -3753,8 +3753,8 @@ void TQFileDialog::okClicked()
= (TQFileDialogPrivate::File *)files->currentItem();
TQFileDialogPrivate::MCItem * m
= (TQFileDialogPrivate::MCItem *)d->moreFiles->item( d->moreFiles->currentItem() );
- if ( c && files->isVisible() && files->hasFocus() ||
- m && d->moreFiles->isVisible() && d->moreFiles->hasFocus() ) {
+ if ( ( c && files->isVisible() && files->hasFocus() ) ||
+ ( m && d->moreFiles->isVisible() && d->moreFiles->hasFocus() ) ) {
if ( c && files->isVisible() )
f = c->info;
else
@@ -5480,8 +5480,8 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e )
return TRUE;
} else if ( ( o == d->moreFiles || o == d->moreFiles->viewport() ) &&
e->type() == TQEvent::FocusIn ) {
- if ( o == d->moreFiles->viewport() && !d->moreFiles->viewport()->hasFocus() ||
- o == d->moreFiles && !d->moreFiles->hasFocus() )
+ if ( ( o == d->moreFiles->viewport() && !d->moreFiles->viewport()->hasFocus() ) ||
+ ( o == d->moreFiles && !d->moreFiles->hasFocus() ) )
((TQWidget*)o)->setFocus();
return FALSE;
}
@@ -6015,7 +6015,7 @@ void TQFileDialog::insertEntry( const TQValueList<TQUrlInfo> &lst, TQNetworkOper
i = new TQFileDialogPrivate::File( d, &inf, files );
i2 = new TQFileDialogPrivate::MCItem( d->moreFiles, i );
- if ( d->mode == ExistingFiles && inf.isDir() ||
+ if ( ( d->mode == ExistingFiles && inf.isDir() ) ||
( isDirectoryMode( d->mode ) && inf.isFile() ) ) {
i->setSelectable( FALSE );
i2->setSelectable( FALSE );
@@ -6297,7 +6297,7 @@ void TQFileDialog::resortDir()
item2 = new TQFileDialogPrivate::MCItem( d->moreFiles, item, item2 );
item->i = item2;
d->pendingItems.append( item );
- if ( d->mode == ExistingFiles && item->info.isDir() ||
+ if ( ( d->mode == ExistingFiles && item->info.isDir() ) ||
( isDirectoryMode( d->mode ) && item->info.isFile() ) ) {
item->setSelectable( FALSE );
item2->setSelectable( FALSE );
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index 87560add1..eeaf54dc6 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -573,7 +573,7 @@ int TQProgressDialog::progress() const
void TQProgressDialog::setProgress( int progress )
{
if ( progress == bar()->progress() ||
- bar()->progress() == -1 && progress == bar()->totalSteps() )
+ ( bar()->progress() == -1 && progress == bar()->totalSteps() ) )
return;
bar()->setProgress(progress);