clang-format: Increase column limit from 80 to 120

This commit is contained in:
Ryan Foster
2024-10-04 17:33:58 -04:00
parent 109f64c446
commit a1fbf1015f
736 changed files with 22684 additions and 45435 deletions

View File

@@ -93,8 +93,7 @@ ScriptLogWindow::ScriptLogWindow() : QDialog(nullptr)
QHBoxLayout *buttonLayout = new QHBoxLayout();
QPushButton *clearButton = new QPushButton(tr("Clear"));
connect(clearButton, &QPushButton::clicked, this,
&ScriptLogWindow::ClearWindow);
connect(clearButton, &QPushButton::clicked, this, &ScriptLogWindow::ClearWindow);
QPushButton *closeButton = new QPushButton(tr("Close"));
connect(closeButton, &QPushButton::clicked, this, &QDialog::hide);
@@ -114,8 +113,7 @@ ScriptLogWindow::ScriptLogWindow() : QDialog(nullptr)
resize(600, 400);
config_t *global_config = obs_frontend_get_user_config();
const char *geom =
config_get_string(global_config, "ScriptLogWindow", "geometry");
const char *geom = config_get_string(global_config, "ScriptLogWindow", "geometry");
if (geom != nullptr) {
QByteArray ba = QByteArray::fromBase64(QByteArray(geom));
restoreGeometry(ba);
@@ -123,15 +121,13 @@ ScriptLogWindow::ScriptLogWindow() : QDialog(nullptr)
setWindowTitle(obs_module_text("ScriptLogWindow"));
connect(edit->verticalScrollBar(), &QAbstractSlider::sliderMoved, this,
&ScriptLogWindow::ScrollChanged);
connect(edit->verticalScrollBar(), &QAbstractSlider::sliderMoved, this, &ScriptLogWindow::ScrollChanged);
}
ScriptLogWindow::~ScriptLogWindow()
{
config_t *global_config = obs_frontend_get_user_config();
config_set_string(global_config, "ScriptLogWindow", "geometry",
saveGeometry().toBase64().constData());
config_set_string(global_config, "ScriptLogWindow", "geometry", saveGeometry().toBase64().constData());
}
void ScriptLogWindow::ScrollChanged(int val)
@@ -190,8 +186,7 @@ ScriptsTool::ScriptsTool() : QDialog(nullptr), ui(new Ui_ScriptsTool)
#if PYTHON_UI
config_t *config = obs_frontend_get_user_config();
const char *path =
config_get_string(config, "Python", "Path" ARCH_NAME);
const char *path = config_get_string(config, "Python", "Path" ARCH_NAME);
ui->pythonPath->setText(path);
ui->pythonPathLabel->setText(obs_module_text(PYTHONPATH_LABEL_TEXT));
updatePythonVersionLabel();
@@ -203,8 +198,7 @@ ScriptsTool::ScriptsTool() : QDialog(nullptr), ui(new Ui_ScriptsTool)
delete propertiesView;
propertiesView = new QWidget();
propertiesView->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
propertiesView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
ui->propertiesLayout->addWidget(propertiesView);
config_t *user_config = obs_frontend_get_user_config();
@@ -215,8 +209,7 @@ ScriptsTool::ScriptsTool() : QDialog(nullptr), ui(new Ui_ScriptsTool)
ScriptsTool::~ScriptsTool()
{
config_t *user_config = obs_frontend_get_user_config();
config_set_int(user_config, "scripts-tool", "prevScriptRow",
ui->scripts->currentRow());
config_set_int(user_config, "scripts-tool", "prevScriptRow", ui->scripts->currentRow());
}
void ScriptsTool::updatePythonVersionLabel()
@@ -225,8 +218,7 @@ void ScriptsTool::updatePythonVersionLabel()
if (obs_scripting_python_loaded()) {
char version[8];
obs_scripting_python_version(version, sizeof(version));
label = QString(obs_module_text("PythonSettings.PythonVersion"))
.arg(version);
label = QString(obs_module_text("PythonSettings.PythonVersion")).arg(version);
} else {
label = obs_module_text("PythonSettings.PythonNotLoaded");
}
@@ -240,8 +232,7 @@ void ScriptsTool::RemoveScript(const char *path)
const char *script_path = obs_script_get_path(script);
if (strcmp(script_path, path) == 0) {
scriptData->scripts.erase(scriptData->scripts.begin() +
i);
scriptData->scripts.erase(scriptData->scripts.begin() + i);
break;
}
}
@@ -256,8 +247,7 @@ void ScriptsTool::ReloadScript(const char *path)
OBSDataAutoRelease settings = obs_data_create();
obs_properties_t *prop =
obs_script_get_properties(script);
obs_properties_t *prop = obs_script_get_properties(script);
obs_properties_apply_settings(prop, settings);
obs_properties_destroy(prop);
@@ -285,8 +275,7 @@ void ScriptsTool::SetScriptDefaults(const char *path)
for (OBSScript &script : scriptData->scripts) {
const char *script_path = obs_script_get_path(script);
if (strcmp(script_path, path) == 0) {
OBSDataAutoRelease settings =
obs_script_get_settings(script);
OBSDataAutoRelease settings = obs_script_get_settings(script);
obs_data_clear(settings);
obs_script_update(script, nullptr);
@@ -335,15 +324,13 @@ void ScriptsTool::on_addScripts_clicked()
lastBrowsedDir = baseScriptPath;
}
QStringList files = OpenFiles(this,
QT_UTF8(obs_module_text("AddScripts")),
QT_UTF8(lastBrowsedDir.c_str()), filter);
QStringList files =
OpenFiles(this, QT_UTF8(obs_module_text("AddScripts")), QT_UTF8(lastBrowsedDir.c_str()), filter);
if (!files.count())
return;
for (const QString &file : files) {
lastBrowsedDir =
QFileInfo(file).absolutePath().toUtf8().constData();
lastBrowsedDir = QFileInfo(file).absolutePath().toUtf8().constData();
QByteArray pathBytes = file.toUtf8();
const char *path = pathBytes.constData();
@@ -358,15 +345,13 @@ void ScriptsTool::on_addScripts_clicked()
scriptData->scripts.emplace_back(script);
QListWidgetItem *item =
new QListWidgetItem(script_file);
QListWidgetItem *item = new QListWidgetItem(script_file);
item->setData(Qt::UserRole, QString(file));
ui->scripts->addItem(item);
OBSDataAutoRelease settings = obs_data_create();
obs_properties_t *prop =
obs_script_get_properties(script);
obs_properties_t *prop = obs_script_get_properties(script);
obs_properties_apply_settings(prop, settings);
obs_properties_destroy(prop);
@@ -380,10 +365,7 @@ void ScriptsTool::on_removeScripts_clicked()
QList<QListWidgetItem *> items = ui->scripts->selectedItems();
for (QListWidgetItem *item : items)
RemoveScript(item->data(Qt::UserRole)
.toString()
.toUtf8()
.constData());
RemoveScript(item->data(Qt::UserRole).toString().toUtf8().constData());
RefreshLists();
}
@@ -391,10 +373,7 @@ void ScriptsTool::on_reloadScripts_clicked()
{
QList<QListWidgetItem *> items = ui->scripts->selectedItems();
for (QListWidgetItem *item : items)
ReloadScript(item->data(Qt::UserRole)
.toString()
.toUtf8()
.constData());
ReloadScript(item->data(Qt::UserRole).toString().toUtf8().constData());
on_scripts_currentRowChanged(ui->scripts->currentRow());
}
@@ -405,8 +384,7 @@ void ScriptsTool::OpenScriptParentDirectory()
for (QListWidgetItem *item : items) {
QDir dir(item->data(Qt::UserRole).toString());
dir.cdUp();
QDesktopServices::openUrl(
QUrl::fromLocalFile(dir.absolutePath()));
QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
}
}
@@ -423,13 +401,10 @@ void ScriptsTool::on_scripts_customContextMenuRequested(const QPoint &pos)
if (item) {
popup.addSeparator();
popup.addAction(obs_module_text("Reload"), this,
&ScriptsTool::on_reloadScripts_clicked);
popup.addAction(obs_module_text("OpenFileLocation"), this,
&ScriptsTool::OpenScriptParentDirectory);
popup.addAction(obs_module_text("Reload"), this, &ScriptsTool::on_reloadScripts_clicked);
popup.addAction(obs_module_text("OpenFileLocation"), this, &ScriptsTool::OpenScriptParentDirectory);
popup.addSeparator();
popup.addAction(tr("Remove"), this,
&ScriptsTool::on_removeScripts_clicked);
popup.addAction(tr("Remove"), this, &ScriptsTool::on_removeScripts_clicked);
}
obs_frontend_pop_ui_translation();
@@ -441,8 +416,7 @@ void ScriptsTool::on_editScript_clicked()
int row = ui->scripts->currentRow();
if (row == -1)
return;
QUrl url = QUrl::fromLocalFile(
ui->scripts->item(row)->data(Qt::UserRole).toString());
QUrl url = QUrl::fromLocalFile(ui->scripts->item(row)->data(Qt::UserRole).toString());
QDesktopServices::openUrl(url);
}
@@ -455,8 +429,7 @@ void ScriptsTool::on_scriptLog_clicked()
void ScriptsTool::on_pythonPathBrowse_clicked()
{
QString curPath = ui->pythonPath->text();
QString newPath =
SelectDirectory(this, ui->pythonPathLabel->text(), curPath);
QString newPath = SelectDirectory(this, ui->pythonPathLabel->text(), curPath);
if (newPath.isEmpty())
return;
@@ -474,14 +447,8 @@ void ScriptsTool::on_pythonPathBrowse_clicked()
if (loaded && !newPath.isEmpty() && curPath.compare(newPath) != 0) {
char version[8];
obs_scripting_python_version(version, sizeof(version));
QString message =
QString(obs_module_text(
"PythonSettings.AlreadyLoaded.Message"))
.arg(version);
OBSMessageBox::information(
this,
obs_module_text("PythonSettings.AlreadyLoaded.Title"),
message);
QString message = QString(obs_module_text("PythonSettings.AlreadyLoaded.Message")).arg(version);
OBSMessageBox::information(this, obs_module_text("PythonSettings.AlreadyLoaded.Title"), message);
return;
} else if (loaded) {
return;
@@ -509,15 +476,13 @@ void ScriptsTool::on_scripts_currentRowChanged(int row)
if (row == -1) {
propertiesView = new QWidget();
propertiesView->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
propertiesView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
ui->propertiesLayout->addWidget(propertiesView);
ui->description->setText(QString());
return;
}
QByteArray array =
ui->scripts->item(row)->data(Qt::UserRole).toString().toUtf8();
QByteArray array = ui->scripts->item(row)->data(Qt::UserRole).toString().toUtf8();
const char *path = array.constData();
obs_script_t *script = scriptData->FindScript(path);
@@ -528,10 +493,9 @@ void ScriptsTool::on_scripts_currentRowChanged(int row)
OBSDataAutoRelease settings = obs_script_get_settings(script);
OBSPropertiesView *view = new OBSPropertiesView(
settings.Get(), script,
(PropertiesReloadCallback)obs_script_get_properties, nullptr,
(PropertiesVisualUpdateCb)obs_script_update);
OBSPropertiesView *view = new OBSPropertiesView(settings.Get(), script,
(PropertiesReloadCallback)obs_script_get_properties, nullptr,
(PropertiesVisualUpdateCb)obs_script_update);
view->SetDeferrable(false);
propertiesView = view;
@@ -546,33 +510,26 @@ void ScriptsTool::on_defaults_clicked()
if (!item)
return;
SetScriptDefaults(
item->data(Qt::UserRole).toString().toUtf8().constData());
SetScriptDefaults(item->data(Qt::UserRole).toString().toUtf8().constData());
}
void ScriptsTool::on_description_linkActivated(const QString &link)
{
QUrl url(link, QUrl::StrictMode);
if (url.isValid() && (url.scheme().compare("http") == 0 ||
url.scheme().compare("https") == 0)) {
if (url.isValid() && (url.scheme().compare("http") == 0 || url.scheme().compare("https") == 0)) {
QString msg(obs_module_text("ScriptDescriptionLink.Text"));
msg += "\n\n";
msg += QString(obs_module_text(
"ScriptDescriptionLink.Text.Url"))
.arg(link);
msg += QString(obs_module_text("ScriptDescriptionLink.Text.Url")).arg(link);
const char *open =
obs_module_text("ScriptDescriptionLink.OpenURL");
const char *open = obs_module_text("ScriptDescriptionLink.OpenURL");
QMessageBox messageBox(this);
messageBox.setWindowTitle(open);
messageBox.setText(msg);
obs_frontend_push_ui_translation(obs_module_get_string);
QPushButton *yesButton =
messageBox.addButton(open, QMessageBox::YesRole);
QPushButton *noButton =
messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
QPushButton *yesButton = messageBox.addButton(open, QMessageBox::YesRole);
QPushButton *noButton = messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
obs_frontend_pop_ui_translation();
messageBox.setDefaultButton(yesButton);
messageBox.setEscapeButton(noButton);
@@ -615,8 +572,7 @@ static void obs_event(enum obs_frontend_event event, void *)
static void load_script_data(obs_data_t *load_data, bool, void *)
{
OBSDataArrayAutoRelease array =
obs_data_get_array(load_data, "scripts-tool");
OBSDataArrayAutoRelease array = obs_data_get_array(load_data, "scripts-tool");
delete scriptData;
scriptData = new ScriptData;
@@ -657,20 +613,17 @@ static void save_script_data(obs_data_t *save_data, bool saving, void *)
obs_data_set_array(save_data, "scripts-tool", array);
}
static void script_log(void *, obs_script_t *script, int log_level,
const char *message)
static void script_log(void *, obs_script_t *script, int log_level, const char *message)
{
QString qmsg;
if (script) {
qmsg = QStringLiteral("[%1] %2").arg(
obs_script_get_file(script), message);
qmsg = QStringLiteral("[%1] %2").arg(obs_script_get_file(script), message);
} else {
qmsg = QStringLiteral("[Unknown Script] %1").arg(message);
}
QMetaObject::invokeMethod(scriptLogWindow, "AddLogMsg",
Q_ARG(int, log_level), Q_ARG(QString, qmsg));
QMetaObject::invokeMethod(scriptLogWindow, "AddLogMsg", Q_ARG(int, log_level), Q_ARG(QString, qmsg));
}
extern "C" void InitScripts()
@@ -680,24 +633,20 @@ extern "C" void InitScripts()
obs_scripting_load();
obs_scripting_set_log_callback(script_log, nullptr);
QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
obs_module_text("Scripts"));
QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(obs_module_text("Scripts"));
#if PYTHON_UI
config_t *config = obs_frontend_get_user_config();
const char *python_path =
config_get_string(config, "Python", "Path" ARCH_NAME);
const char *python_path = config_get_string(config, "Python", "Path" ARCH_NAME);
#ifdef __APPLE__
if (python_path && *python_path) {
std::string _python_path(python_path);
std::size_t pos =
_python_path.find("/Python.framework/Versions");
std::size_t pos = _python_path.find("/Python.framework/Versions");
if (pos != std::string::npos) {
std::string _temp = _python_path.substr(0, pos);
config_set_string(config, "Python", "Path" ARCH_NAME,
_temp.c_str());
config_set_string(config, "Python", "Path" ARCH_NAME, _temp.c_str());
config_save(config);
python_path = _temp.c_str();
}