NOISSUE fix all clang warnings

6 files changed, 10 insertions, 9 deletions

diff --git a/application/dialogs/CopyInstanceDialog.cpp b/application/dialogs/CopyInstanceDialog.cpp
index 0e94540c..54c42f29 100644
--- a/application/dialogs/CopyInstanceDialog.cpp
+++ b/application/dialogs/CopyInstanceDialog.cpp
@@ -82,7 +82,7 @@ QString CopyInstanceDialog::instGroup() const
 void CopyInstanceDialog::on_iconButton_clicked()
 {
 	IconPickerDialog dlg(this);
-	dlg.exec(InstIconKey);
+	dlg.execWithSelection(InstIconKey);
 
 	if (dlg.result() == QDialog::Accepted)
 	{
diff --git a/application/dialogs/IconPickerDialog.cpp b/application/dialogs/IconPickerDialog.cpp
index 7bde6fd0..f750cd27 100644
--- a/application/dialogs/IconPickerDialog.cpp
+++ b/application/dialogs/IconPickerDialog.cpp
@@ -126,7 +126,7 @@ void IconPickerDialog::selectionChanged(QItemSelection selected, QItemSelection
 		selectedIconKey = key;
 }
 
-int IconPickerDialog::exec(QString selection)
+int IconPickerDialog::execWithSelection(QString selection)
 {
 	auto list = ENV.icons();
 	auto contentsWidget = ui->iconView;
diff --git a/application/dialogs/IconPickerDialog.h b/application/dialogs/IconPickerDialog.h
index 610d9306..e57374a7 100644
--- a/application/dialogs/IconPickerDialog.h
+++ b/application/dialogs/IconPickerDialog.h
@@ -29,7 +29,7 @@ class IconPickerDialog : public QDialog
 public:
 	explicit IconPickerDialog(QWidget *parent = 0);
 	~IconPickerDialog();
-	int exec(QString selection);
+	int execWithSelection(QString selection);
 	QString selectedIconKey;
 
 protected:
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index 0360f5f1..0d54172d 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/application/dialogs/NewInstanceDialog.cpp
@@ -122,9 +122,10 @@ void NewInstanceDialog::updateDialogState()
 	{
 		ui->instNameTextBox->setPlaceholderText(suggestedName);
 	}
-	bool allowOK = !instName().isEmpty() &&
-				   (ui->versionBox->isChecked() && m_selectedVersion ||
-					(ui->modpackBox->isChecked() && ui->modpackEdit->hasAcceptableInput()));
+	bool allowOK = !instName().isEmpty() && (
+		(ui->versionBox->isChecked() && m_selectedVersion) ||
+		(ui->modpackBox->isChecked() && ui->modpackEdit->hasAcceptableInput())
+	);
 	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(allowOK);
 }
 
@@ -206,7 +207,7 @@ void NewInstanceDialog::on_btnChangeVersion_clicked()
 void NewInstanceDialog::on_iconButton_clicked()
 {
 	IconPickerDialog dlg(this);
-	dlg.exec(InstIconKey);
+	dlg.execWithSelection(InstIconKey);
 
 	if (dlg.result() == QDialog::Accepted)
 	{
diff --git a/application/dialogs/ProgressDialog.cpp b/application/dialogs/ProgressDialog.cpp
index 83f82d33..bca4e168 100644
--- a/application/dialogs/ProgressDialog.cpp
+++ b/application/dialogs/ProgressDialog.cpp
@@ -52,7 +52,7 @@ void ProgressDialog::updateSize()
 	resize(QSize(480, minimumSizeHint().height()));
 }
 
-int ProgressDialog::exec(Task *task)
+int ProgressDialog::execWithTask(Task *task)
 {
 	this->task = task;
 	QDialog::DialogCode result;
diff --git a/application/dialogs/ProgressDialog.h b/application/dialogs/ProgressDialog.h
index 44cbbe88..9ddbceb1 100644
--- a/application/dialogs/ProgressDialog.h
+++ b/application/dialogs/ProgressDialog.h
@@ -34,7 +34,7 @@ public:
 
 	void updateSize();
 
-	int exec(Task *task);
+	int execWithTask(Task *task);
 
 	void setSkipButton(bool present, QString label = QString());