From 249b43a2a894c670531a464b0b1f2bb065c4c13a Mon Sep 17 00:00:00 2001 From: VoxelTek <53562267+VoxelTek@users.noreply.github.com> Date: Thu, 24 Jul 2025 02:05:24 +1000 Subject: [PATCH] Make clang-format happy --- CONFIG/MainDlg.cpp | 33 +++++++++++---------------------- CONFIG/MainDlg.h | 2 +- CONFIG/config.cpp | 6 +++--- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/CONFIG/MainDlg.cpp b/CONFIG/MainDlg.cpp index c833b315..55f06cf3 100644 --- a/CONFIG/MainDlg.cpp +++ b/CONFIG/MainDlg.cpp @@ -13,8 +13,8 @@ #include #include #include -#include #include +#include #include #include @@ -57,24 +57,9 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent) &CMainDialog::OnRadiobuttonTextureHighQuality ); - connect( - m_ui->windowedRadioButton, - &QRadioButton::toggled, - this, - &CMainDialog::OnRadioWindowed - ); - connect( - m_ui->fullscreenRadioButton, - &QRadioButton::toggled, - this, - &CMainDialog::OnRadioFullscreen - ); - connect( - m_ui->exFullscreenRadioButton, - &QRadioButton::toggled, - this, - &CMainDialog::OnRadioExclusiveFullscreen - ); + connect(m_ui->windowedRadioButton, &QRadioButton::toggled, this, &CMainDialog::OnRadioWindowed); + connect(m_ui->fullscreenRadioButton, &QRadioButton::toggled, this, &CMainDialog::OnRadioFullscreen); + connect(m_ui->exFullscreenRadioButton, &QRadioButton::toggled, this, &CMainDialog::OnRadioExclusiveFullscreen); connect(m_ui->devicesList, &QListWidget::currentRowChanged, this, &CMainDialog::OnList3DevicesSelectionChanged); connect(m_ui->musicCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxMusic); connect(m_ui->sound3DCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckbox3DSound); @@ -193,10 +178,13 @@ bool CMainDialog::OnInitDialog() displayModes = SDL_GetFullscreenDisplayModes(SDL_GetPrimaryDisplay(), &displayModeCount); for (int i = 0; i < displayModeCount; ++i) { - QString mode = QString("%1x%2 @ %3Hz").arg(displayModes[i]->w).arg(displayModes[i]->h).arg(displayModes[i]->refresh_rate); + QString mode = + QString("%1x%2 @ %3Hz").arg(displayModes[i]->w).arg(displayModes[i]->h).arg(displayModes[i]->refresh_rate); m_ui->exFullResComboBox->addItem(mode); - if ((displayModes[i]->w == currentConfigApp->m_exf_x_res) && (displayModes[i]->h == currentConfigApp->m_exf_y_res) && (displayModes[i]->refresh_rate == currentConfigApp->m_exf_fps)) { + if ((displayModes[i]->w == currentConfigApp->m_exf_x_res) && + (displayModes[i]->h == currentConfigApp->m_exf_y_res) && + (displayModes[i]->refresh_rate == currentConfigApp->m_exf_fps)) { m_ui->exFullResComboBox->setCurrentIndex(i); } } @@ -392,7 +380,8 @@ void CMainDialog::OnRadiobuttonTextureHighQuality(bool checked) } } -void CMainDialog::OnRadioWindowed(bool checked) { +void CMainDialog::OnRadioWindowed(bool checked) +{ if (checked) { currentConfigApp->m_full_screen = false; currentConfigApp->m_exclusive_full_screen = false; diff --git a/CONFIG/MainDlg.h b/CONFIG/MainDlg.h index afbfd08f..c453c785 100644 --- a/CONFIG/MainDlg.h +++ b/CONFIG/MainDlg.h @@ -30,7 +30,7 @@ class CMainDialog : public QDialog { bool m_modified = false; bool m_advanced = false; Ui::MainDialog* m_ui = nullptr; - SDL_DisplayMode ** displayModes; + SDL_DisplayMode** displayModes; void keyReleaseEvent(QKeyEvent* event) override; bool OnInitDialog(); diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp index fa2b76d0..fd61fbb8 100644 --- a/CONFIG/config.cpp +++ b/CONFIG/config.cpp @@ -269,15 +269,15 @@ bool CConfigApp::ValidateSettings() m_full_screen = TRUE; is_modified = TRUE; } - if (!(m_msaa & (m_msaa - 1))) { //Check if MSAA is power of 2 (1, 2, 4, 8, etc) - m_msaa = exp2(round(log2(m_msaa))); //Closest power of 2 + if (!(m_msaa & (m_msaa - 1))) { // Check if MSAA is power of 2 (1, 2, 4, 8, etc) + m_msaa = exp2(round(log2(m_msaa))); // Closest power of 2 is_modified = TRUE; } if (m_msaa > 16) { m_msaa = 16; is_modified = TRUE; } - else if (m_msaa < 1){ + else if (m_msaa < 1) { m_msaa = 1; is_modified = TRUE; }