diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:50:52 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-04 14:53:35 +0200 |
commit | 5ae82a06c308960c66757b0a956500b05b83f002 (patch) | |
tree | e73bef929c230d306f377880042ce09894812ccd /src/dialogs/qfiledialog.cpp | |
parent | e9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff) | |
download | qt3-3.5.13.1.tar.gz qt3-3.5.13.1.zip |
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch!
(cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'src/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/dialogs/qfiledialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 7d08986..7666770 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -1453,7 +1453,7 @@ void QFileListBox::viewportDropEvent( QDropEvent *e ) bool QFileListBox::acceptDrop( const QPoint &pnt, QWidget *source ) { QListBoxItem *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 QFileDialogQFileListView::viewportDropEvent( QDropEvent *e ) bool QFileDialogQFileListView::acceptDrop( const QPoint &pnt, QWidget *source ) { QListViewItem *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 QFileDialog::okClicked() = (QFileDialogPrivate::File *)files->currentItem(); QFileDialogPrivate::MCItem * m = (QFileDialogPrivate::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 QFileDialog::eventFilter( QObject * o, QEvent * e ) return TRUE; } else if ( ( o == d->moreFiles || o == d->moreFiles->viewport() ) && e->type() == QEvent::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() ) ) ((QWidget*)o)->setFocus(); return FALSE; } @@ -6015,7 +6015,7 @@ void QFileDialog::insertEntry( const QValueList<QUrlInfo> &lst, QNetworkOperatio i = new QFileDialogPrivate::File( d, &inf, files ); i2 = new QFileDialogPrivate::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 QFileDialog::resortDir() item2 = new QFileDialogPrivate::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 ); |