CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix all clang warnings

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-26 04:04:09 +02:00
parent 0af04dc060
commit cca6700134
52 changed files with 132 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/dialogs/CopyInstanceDialog.cpp
View File

@ -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)
{

2
application/dialogs/IconPickerDialog.cpp
View File

@ -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;

2
application/dialogs/IconPickerDialog.h
View File

@ -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:

9
application/dialogs/NewInstanceDialog.cpp
View File

@ -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)
{

2
application/dialogs/ProgressDialog.cpp
View File

@ -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;

2
application/dialogs/ProgressDialog.h
View File

@ -34,7 +34,7 @@ public:
void updateSize();
int exec(Task *task);
int execWithTask(Task *task);
void setSkipButton(bool present, QString label = QString());