From 63feebc34f41efd875b492e4ee7165ab6e821d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 11 Nov 2017 21:52:36 +0100 Subject: [PATCH] GUI: Use early return --- gui/librarydialog.cpp | 53 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp index 0db721ee0..28e108ab6 100644 --- a/gui/librarydialog.cpp +++ b/gui/librarydialog.cpp @@ -86,33 +86,34 @@ void LibraryDialog::openCfg() filter, &selectedFilter); - if (!selectedFile.isEmpty()) { - QFile file(selectedFile); - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - ignoreChanges = true; - data.open(file); - mFileName = selectedFile; - ui->buttonSave->setEnabled(false); - ui->buttonSaveAs->setEnabled(true); - ui->filter->clear(); - ui->functions->clear(); - for (CppcheckLibraryData::Function &function : data.functions) { - ui->functions->addItem(new FunctionListItem(ui->functions, - &function, - false)); - } - ui->sortFunctions->setEnabled(!data.functions.empty()); - ui->filter->setEnabled(!data.functions.empty()); - ui->addFunction->setEnabled(true); - ignoreChanges = false; - } else { - QMessageBox msg(QMessageBox::Critical, - tr("Cppcheck"), - tr("Can not open file %1.").arg(selectedFile), - QMessageBox::Ok, - this); - msg.exec(); + if (selectedFile.isEmpty()) + return; + + QFile file(selectedFile); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + ignoreChanges = true; + data.open(file); + mFileName = selectedFile; + ui->buttonSave->setEnabled(false); + ui->buttonSaveAs->setEnabled(true); + ui->filter->clear(); + ui->functions->clear(); + for (CppcheckLibraryData::Function &function : data.functions) { + ui->functions->addItem(new FunctionListItem(ui->functions, + &function, + false)); } + ui->sortFunctions->setEnabled(!data.functions.empty()); + ui->filter->setEnabled(!data.functions.empty()); + ui->addFunction->setEnabled(true); + ignoreChanges = false; + } else { + QMessageBox msg(QMessageBox::Critical, + tr("Cppcheck"), + tr("Can not open file %1.").arg(selectedFile), + QMessageBox::Ok, + this); + msg.exec(); } }