Merge pull request #946 from lioncash/compress

qt/main: Collapse if statement in UpdateRecentFiles()
This commit is contained in:
bunnei 2018-08-06 21:34:20 -04:00 committed by GitHub
commit 75df8a3969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -81,6 +81,8 @@ static void ShowCalloutMessage(const QString& message, CalloutFlag flag) {
void GMainWindow::ShowCallouts() {} void GMainWindow::ShowCallouts() {}
const int GMainWindow::max_recent_files_item;
GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
debug_context = Tegra::DebugContext::Construct(); debug_context = Tegra::DebugContext::Construct();
@ -579,11 +581,11 @@ void GMainWindow::StoreRecentFile(const QString& filename) {
} }
void GMainWindow::UpdateRecentFiles() { void GMainWindow::UpdateRecentFiles() {
unsigned int num_recent_files = const int num_recent_files =
std::min(UISettings::values.recent_files.size(), static_cast<int>(max_recent_files_item)); std::min(UISettings::values.recent_files.size(), max_recent_files_item);
for (unsigned int i = 0; i < num_recent_files; i++) { for (int i = 0; i < num_recent_files; i++) {
QString text = QString("&%1. %2").arg(i + 1).arg( const QString text = QString("&%1. %2").arg(i + 1).arg(
QFileInfo(UISettings::values.recent_files[i]).fileName()); QFileInfo(UISettings::values.recent_files[i]).fileName());
actions_recent_files[i]->setText(text); actions_recent_files[i]->setText(text);
actions_recent_files[i]->setData(UISettings::values.recent_files[i]); actions_recent_files[i]->setData(UISettings::values.recent_files[i]);
@ -595,12 +597,8 @@ void GMainWindow::UpdateRecentFiles() {
actions_recent_files[j]->setVisible(false); actions_recent_files[j]->setVisible(false);
} }
// Grey out the recent files menu if the list is empty // Enable the recent files menu if the list isn't empty
if (num_recent_files == 0) { ui.menu_recent_files->setEnabled(num_recent_files != 0);
ui.menu_recent_files->setEnabled(false);
} else {
ui.menu_recent_files->setEnabled(true);
}
} }
void GMainWindow::OnGameListLoadFile(QString game_path) { void GMainWindow::OnGameListLoadFile(QString game_path) {