A bit more clang-format

This commit is contained in:
Jasmine Iwanek
2022-11-19 08:49:04 -05:00
parent b04dd8cc8b
commit 3fe4f75108
223 changed files with 8047 additions and 7456 deletions

View File

@@ -27,8 +27,7 @@
#include <QFile>
#include <QLibraryInfo>
extern "C"
{
extern "C" {
#include <86box/86box.h>
#include <86box/version.h>
#include <86box/config.h>
@@ -37,13 +36,13 @@ extern "C"
#include <86box/rom.h>
}
static QMap<QString, QString> iconset_to_qt;
extern MainWindow* main_window;
extern MainWindow *main_window;
ProgSettings::CustomTranslator* ProgSettings::translator = nullptr;
QTranslator* ProgSettings::qtTranslator = nullptr;
QString ProgSettings::getIconSetPath()
ProgSettings::CustomTranslator *ProgSettings::translator = nullptr;
QTranslator *ProgSettings::qtTranslator = nullptr;
QString
ProgSettings::getIconSetPath()
{
if (iconset_to_qt.isEmpty()) {
// Always include default bundled icons
@@ -66,46 +65,48 @@ QString ProgSettings::getIconSetPath()
return iconset_to_qt[icon_set];
}
QIcon ProgSettings::loadIcon(QString file)
QIcon
ProgSettings::loadIcon(QString file)
{
(void)getIconSetPath();
if (!QFile::exists(iconset_to_qt[icon_set] + file)) return QIcon(iconset_to_qt[""] + file);
(void) getIconSetPath();
if (!QFile::exists(iconset_to_qt[icon_set] + file))
return QIcon(iconset_to_qt[""] + file);
return QIcon(iconset_to_qt[icon_set] + file);
}
ProgSettings::ProgSettings(QWidget *parent) :
QDialog(parent),
ui(new Ui::ProgSettings)
ProgSettings::ProgSettings(QWidget *parent)
: QDialog(parent)
, ui(new Ui::ProgSettings)
{
ui->setupUi(this);
(void)getIconSetPath();
(void) getIconSetPath();
ui->comboBox->setItemData(0, "");
ui->comboBox->setCurrentIndex(0);
for (auto i = iconset_to_qt.begin(); i != iconset_to_qt.end(); i++)
{
if (i.key() == "") continue;
for (auto i = iconset_to_qt.begin(); i != iconset_to_qt.end(); i++) {
if (i.key() == "")
continue;
QFile iconfile(i.value() + "/iconinfo.txt");
iconfile.open(QFile::ReadOnly);
QString friendlyName;
QString iconsetinfo(iconfile.readAll());
iconfile.close();
if (iconsetinfo.isEmpty()) friendlyName = i.key();
else friendlyName = iconsetinfo.split('\n')[0];
if (iconsetinfo.isEmpty())
friendlyName = i.key();
else
friendlyName = iconsetinfo.split('\n')[0];
ui->comboBox->addItem(friendlyName, i.key());
if (strcmp(icon_set, i.key().toUtf8().data()) == 0)
{
if (strcmp(icon_set, i.key().toUtf8().data()) == 0) {
ui->comboBox->setCurrentIndex(ui->comboBox->findData(i.key()));
}
}
ui->comboBox->setItemData(0, '(' + tr("Default") + ')', Qt::DisplayRole);
ui->comboBoxLanguage->setItemData(0, 0xFFFF);
for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++)
{
if (i.key() == 0xFFFF) continue;
for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) {
if (i.key() == 0xFFFF)
continue;
ui->comboBoxLanguage->addItem(lcid_langcode[i.key()].second, i.key());
if (i.key() == lang_id)
{
if (i.key() == lang_id) {
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
}
}
@@ -115,10 +116,11 @@ ProgSettings::ProgSettings(QWidget *parent) :
ui->openDirUsrPath->setChecked(open_dir_usr_path > 0);
}
void ProgSettings::accept()
void
ProgSettings::accept()
{
strcpy(icon_set, ui->comboBox->currentData().toString().toUtf8().data());
lang_id = ui->comboBoxLanguage->currentData().toUInt();
lang_id = ui->comboBoxLanguage->currentData().toUInt();
open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0;
loadTranslators(QCoreApplication::instance());
@@ -126,7 +128,8 @@ void ProgSettings::accept()
update_mouse_msg();
main_window->ui->retranslateUi(main_window);
QString vmname(vm_name);
if (vmname.at(vmname.size() - 1) == '"' || vmname.at(vmname.size() - 1) == '\'') vmname.truncate(vmname.size() - 1);
if (vmname.at(vmname.size() - 1) == '"' || vmname.at(vmname.size() - 1) == '\'')
vmname.truncate(vmname.size() - 1);
main_window->setWindowTitle(QString("%1 - %2 %3").arg(vmname, EMU_NAME, EMU_VERSION_FULL));
QString msg = main_window->status->getMessage();
main_window->status.reset(new MachineStatus(main_window));
@@ -143,47 +146,42 @@ ProgSettings::~ProgSettings()
delete ui;
}
void ProgSettings::on_pushButton_released()
void
ProgSettings::on_pushButton_released()
{
ui->comboBox->setCurrentIndex(0);
}
void ProgSettings::loadTranslators(QObject *parent)
void
ProgSettings::loadTranslators(QObject *parent)
{
if (qtTranslator)
{
if (qtTranslator) {
QApplication::removeTranslator(qtTranslator);
qtTranslator = nullptr;
}
if (translator)
{
if (translator) {
QApplication::removeTranslator(translator);
translator = nullptr;
}
qtTranslator = new QTranslator(parent);
translator = new CustomTranslator(parent);
qtTranslator = new QTranslator(parent);
translator = new CustomTranslator(parent);
QString localetofilename = "";
if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false)
{
for (int i = 0; i < QLocale::system().uiLanguages().size(); i++)
{
if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false) {
for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) {
localetofilename = QLocale::system().uiLanguages()[i];
if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/")))
{
if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) {
qDebug() << "Translations loaded.\n";
QCoreApplication::installTranslator(translator);
if (!qtTranslator->load(QLatin1String("qtbase_") + localetofilename.replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
qtTranslator->load(QLatin1String("qt_") + localetofilename.replace('-', '_'), QApplication::applicationDirPath() + "/./translations/");
if (QApplication::installTranslator(qtTranslator))
{
qDebug() << "Qt translations loaded." << "\n";
if (QApplication::installTranslator(qtTranslator)) {
qDebug() << "Qt translations loaded."
<< "\n";
}
break;
}
}
}
else
{
} else {
translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/"));
QCoreApplication::installTranslator(translator);
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
@@ -192,20 +190,21 @@ void ProgSettings::loadTranslators(QObject *parent)
}
}
void ProgSettings::on_pushButtonLanguage_released()
void
ProgSettings::on_pushButtonLanguage_released()
{
ui->comboBoxLanguage->setCurrentIndex(0);
}
void ProgSettings::on_horizontalSlider_valueChanged(int value)
void
ProgSettings::on_horizontalSlider_valueChanged(int value)
{
mouseSensitivity = (double)value / 100.;
mouseSensitivity = (double) value / 100.;
}
void ProgSettings::on_pushButton_2_clicked()
void
ProgSettings::on_pushButton_2_clicked()
{
mouseSensitivity = 1.0;
ui->horizontalSlider->setValue(100);
}