From 0df5c366e50b9533fd8ea3f31c4c360ae7f4c5b6 Mon Sep 17 00:00:00 2001 From: Andre Somers Date: Tue, 2 Feb 2016 14:40:29 +0100 Subject: Use QFlags::setFlag where prudent in qtbase QFlags::setFlag is most useful to replace explicit constructs like if (condition) { someFlags |= TheConditionFlag; } else { someFlags &= ~TheConditionFlag; } with someFlags.setFlag(TheConditionFlag, condition); Change-Id: Ie4586681c83e0af812d5bbf14965aad51941a960 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/widgets/dialogs/qfiledialog.cpp') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 288922d740..d5e59d975d 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -786,10 +786,8 @@ void QFileDialog::setOptions(Options options) if (changed & DontUseCustomDirectoryIcons) { QFileIconProvider::Options providerOptions = iconProvider()->options(); - if (options & DontUseCustomDirectoryIcons) - providerOptions |= QFileIconProvider::DontUseCustomDirectoryIcons; - else - providerOptions &= ~QFileIconProvider::DontUseCustomDirectoryIcons; + providerOptions.setFlag(QFileIconProvider::DontUseCustomDirectoryIcons, + options & DontUseCustomDirectoryIcons); iconProvider()->setOptions(providerOptions); } } @@ -3717,10 +3715,7 @@ void QFileDialogPrivate::_q_showHidden() { Q_Q(QFileDialog); QDir::Filters dirFilters = q->filter(); - if (showHiddenAction->isChecked()) - dirFilters |= QDir::Hidden; - else - dirFilters &= ~QDir::Hidden; + dirFilters.setFlag(QDir::Hidden, showHiddenAction->isChecked()); q->setFilter(dirFilters); } -- cgit v1.2.3 From e41e0346698c4578da4625ef3cce7f5417b71e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sun, 24 Jan 2016 11:05:42 +0000 Subject: Use QVector instead of QList for sizeof(T) > sizeof(void*) caught with static analyzer which only warns for trivial cases: - Container must be local - Container isn't passed to any function, assigned to another container or assigned to. Change-Id: I3f3aa73c128a56f067fa8745990977445a495ac4 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/dialogs/qfiledialog.cpp') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index d5e59d975d..af4fd235d5 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3452,7 +3452,7 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text) const QStringList multipleFiles = typedFiles(); if (multipleFiles.count() > 0) { QModelIndexList oldFiles = qFileDialogUi->listView->selectionModel()->selectedRows(); - QModelIndexList newFiles; + QVector newFiles; for (const auto &file : multipleFiles) { QModelIndex idx = model->index(file); if (oldFiles.removeAll(idx) == 0) -- cgit v1.2.3