From 593664dcdb11951d2538bd78d6620b03ca95392a Mon Sep 17 00:00:00 2001 From: derrod Date: Tue, 11 Jul 2023 19:03:33 +0200 Subject: [PATCH] clang-format: Set AllowShortLambdasOnASingleLine to Inline --- .clang-format | 2 +- UI/audio-encoders.cpp | 4 +++- UI/auth-youtube.cpp | 4 +++- UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp | 4 +++- .../decklink-output-ui/decklink-ui-main.cpp | 4 +++- UI/frontend-plugins/frontend-tools/output-timer.cpp | 4 +++- UI/properties-view.cpp | 4 +++- UI/remote-text.cpp | 4 +++- UI/window-basic-main-transitions.cpp | 4 +++- UI/window-basic-main.cpp | 4 +++- UI/window-basic-settings.cpp | 4 +++- plugins/obs-text/gdiplus/obs-text.cpp | 8 ++++++-- plugins/obs-webrtc/whip-output.cpp | 3 ++- plugins/obs-webrtc/whip-service.cpp | 4 +++- 14 files changed, 42 insertions(+), 15 deletions(-) diff --git a/.clang-format b/.clang-format index e1e281067..2f402d514 100644 --- a/.clang-format +++ b/.clang-format @@ -15,7 +15,7 @@ AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: Inline AllowShortIfStatementsOnASingleLine: false -#AllowShortLambdasOnASingleLine: Inline # requires clang-format 9 +AllowShortLambdasOnASingleLine: Inline AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None diff --git a/UI/audio-encoders.cpp b/UI/audio-encoders.cpp index 7da7118bb..e1a0c4cb5 100644 --- a/UI/audio-encoders.cpp +++ b/UI/audio-encoders.cpp @@ -58,7 +58,9 @@ static void HandleListProperty(obs_property_t *prop, const char *id, static void HandleSampleRate(obs_property_t *prop, const char *id) { - auto ReleaseData = [](obs_data_t *data) { obs_data_release(data); }; + auto ReleaseData = [](obs_data_t *data) { + obs_data_release(data); + }; std::unique_ptr data{ obs_encoder_defaults(id), ReleaseData}; diff --git a/UI/auth-youtube.cpp b/UI/auth-youtube.cpp index 5bad0a09a..743c12ed5 100644 --- a/UI/auth-youtube.cpp +++ b/UI/auth-youtube.cpp @@ -302,7 +302,9 @@ std::shared_ptr YoutubeAuth::Login(QWidget *owner, dlg.reject(); }); - auto open_external_browser = [url]() { OpenBrowser(url); }; + auto open_external_browser = [url]() { + OpenBrowser(url); + }; QScopedPointer thread(CreateQThread(open_external_browser)); thread->start(); diff --git a/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp b/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp index 2d8a23253..7d34f6e35 100644 --- a/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp +++ b/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp @@ -412,7 +412,9 @@ void addOutputUI(void) ajaOutputUI = new AJAOutputUI(window); obs_frontend_pop_ui_translation(); - auto cb = []() { ajaOutputUI->ShowHideDialog(); }; + auto cb = []() { + ajaOutputUI->ShowHideDialog(); + }; action->connect(action, &QAction::triggered, cb); } diff --git a/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp b/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp index f5698f3d9..35de8b1b3 100644 --- a/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp +++ b/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp @@ -449,7 +449,9 @@ void addOutputUI(void) doUI = new DecklinkOutputUI(window); obs_frontend_pop_ui_translation(); - auto cb = []() { doUI->ShowHideDialog(); }; + auto cb = []() { + doUI->ShowHideDialog(); + }; action->connect(action, &QAction::triggered, cb); } diff --git a/UI/frontend-plugins/frontend-tools/output-timer.cpp b/UI/frontend-plugins/frontend-tools/output-timer.cpp index df915bb40..d29d4fb11 100644 --- a/UI/frontend-plugins/frontend-tools/output-timer.cpp +++ b/UI/frontend-plugins/frontend-tools/output-timer.cpp @@ -340,7 +340,9 @@ extern "C" void InitOutputTimer() ot = new OutputTimer(window); - auto cb = []() { ot->ShowHideDialog(); }; + auto cb = []() { + ot->ShowHideDialog(); + }; obs_frontend_pop_ui_translation(); diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index b4d9bd155..1e6803315 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -1718,7 +1718,9 @@ static bool FrameRateChanged(QWidget *widget, const char *name, if (!variant.canConvert()) return false; - auto StopUpdating = [&](void *) { w->updating = false; }; + auto StopUpdating = [&](void *) { + w->updating = false; + }; unique_ptr signalGuard( static_cast(w), StopUpdating); w->updating = true; diff --git a/UI/remote-text.cpp b/UI/remote-text.cpp index 839381f59..4a372e156 100644 --- a/UI/remote-text.cpp +++ b/UI/remote-text.cpp @@ -22,7 +22,9 @@ using namespace std; -static auto curl_deleter = [](CURL *curl) { curl_easy_cleanup(curl); }; +static auto curl_deleter = [](CURL *curl) { + curl_easy_cleanup(curl); +}; using Curl = unique_ptr; static size_t string_write(char *ptr, size_t size, size_t nmemb, string &str) diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index 69e53378b..bc18c3639 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -632,7 +632,9 @@ void OBSBasic::on_transitionProps_clicked() if (!obs_source_configurable(source)) return; - auto properties = [&]() { CreatePropertiesWindow(source); }; + auto properties = [&]() { + CreatePropertiesWindow(source); + }; QMenu menu(this); diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 712f2e7d9..29bfcecac 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -3547,7 +3547,9 @@ void OBSBasic::UnhideAllAudioControls() using UnhideAudioMixer_t = decltype(UnhideAudioMixer); auto PreEnum = [](void *data, obs_source_t *source) -> bool /* -- */ - { return (*reinterpret_cast(data))(source); }; + { + return (*reinterpret_cast(data))(source); + }; obs_enum_sources(PreEnum, &UnhideAudioMixer); } diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 9a3caa502..f29e92e50 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -5140,7 +5140,9 @@ static void ResetInvalidSelection(QComboBox *cbox) void OBSBasicSettings::AdvOutRecCheckWarnings() { - auto Checked = [](QCheckBox *box) { return box->isChecked() ? 1 : 0; }; + auto Checked = [](QCheckBox *box) { + return box->isChecked() ? 1 : 0; + }; QString errorMsg; QString warningMsg; diff --git a/plugins/obs-text/gdiplus/obs-text.cpp b/plugins/obs-text/gdiplus/obs-text.cpp index 2070e5936..6d283c56a 100644 --- a/plugins/obs-text/gdiplus/obs-text.cpp +++ b/plugins/obs-text/gdiplus/obs-text.cpp @@ -1113,7 +1113,9 @@ bool obs_module_load(void) si.get_properties = get_properties; si.icon_type = OBS_ICON_TYPE_TEXT; - si.get_name = [](void *) { return obs_module_text("TextGDIPlus"); }; + si.get_name = [](void *) { + return obs_module_text("TextGDIPlus"); + }; si.create = [](obs_data_t *settings, obs_source_t *source) { return (void *)new TextSource(source, settings); }; @@ -1126,7 +1128,9 @@ bool obs_module_load(void) si.get_height = [](void *data) { return reinterpret_cast(data)->cy; }; - si.get_defaults = [](obs_data_t *settings) { defaults(settings, 1); }; + si.get_defaults = [](obs_data_t *settings) { + defaults(settings, 1); + }; si.update = [](void *data, obs_data_t *settings) { reinterpret_cast(data)->Update(settings); }; diff --git a/plugins/obs-webrtc/whip-output.cpp b/plugins/obs-webrtc/whip-output.cpp index 3879e65b7..e2f6990df 100644 --- a/plugins/obs-webrtc/whip-output.cpp +++ b/plugins/obs-webrtc/whip-output.cpp @@ -468,7 +468,8 @@ void register_whip_output() struct encoder_packet *packet) { static_cast(priv_data)->Data(packet); }; - info.get_defaults = [](obs_data_t *) {}; + info.get_defaults = [](obs_data_t *) { + }; info.get_properties = [](void *) -> obs_properties_t * { return obs_properties_create(); }; diff --git a/plugins/obs-webrtc/whip-service.cpp b/plugins/obs-webrtc/whip-service.cpp index 9a6d79e5b..7e73bd63d 100644 --- a/plugins/obs-webrtc/whip-service.cpp +++ b/plugins/obs-webrtc/whip-service.cpp @@ -76,7 +76,9 @@ void register_whip_service() info.get_properties = [](void *) -> obs_properties_t * { return WHIPService::Properties(); }; - info.get_protocol = [](void *) -> const char * { return "WHIP"; }; + info.get_protocol = [](void *) -> const char * { + return "WHIP"; + }; info.get_url = [](void *priv_data) -> const char * { return static_cast(priv_data)->server.c_str(); };