Sfoglia il codice sorgente

clang-format: Set AllowShortLambdasOnASingleLine to Inline

derrod 2 anni fa
parent
commit
593664dcdb

+ 1 - 1
.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

+ 3 - 1
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<obs_data_t, decltype(ReleaseData)> data{
 		obs_encoder_defaults(id), ReleaseData};
 

+ 3 - 1
UI/auth-youtube.cpp

@@ -302,7 +302,9 @@ std::shared_ptr<Auth> YoutubeAuth::Login(QWidget *owner,
 		dlg.reject();
 	});
 
-	auto open_external_browser = [url]() { OpenBrowser(url); };
+	auto open_external_browser = [url]() {
+		OpenBrowser(url);
+	};
 	QScopedPointer<QThread> thread(CreateQThread(open_external_browser));
 	thread->start();
 

+ 3 - 1
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);
 }

+ 3 - 1
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);
 }

+ 3 - 1
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();
 

+ 3 - 1
UI/properties-view.cpp

@@ -1718,7 +1718,9 @@ static bool FrameRateChanged(QWidget *widget, const char *name,
 	if (!variant.canConvert<frame_rate_tag>())
 		return false;
 
-	auto StopUpdating = [&](void *) { w->updating = false; };
+	auto StopUpdating = [&](void *) {
+		w->updating = false;
+	};
 	unique_ptr<void, decltype(StopUpdating)> signalGuard(
 		static_cast<void *>(w), StopUpdating);
 	w->updating = true;

+ 3 - 1
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<CURL, decltype(curl_deleter)>;
 
 static size_t string_write(char *ptr, size_t size, size_t nmemb, string &str)

+ 3 - 1
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);
 

+ 3 - 1
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<UnhideAudioMixer_t *>(data))(source); };
+	{
+		return (*reinterpret_cast<UnhideAudioMixer_t *>(data))(source);
+	};
 
 	obs_enum_sources(PreEnum, &UnhideAudioMixer);
 }

+ 3 - 1
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;

+ 6 - 2
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<TextSource *>(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<TextSource *>(data)->Update(settings);
 	};

+ 2 - 1
plugins/obs-webrtc/whip-output.cpp

@@ -468,7 +468,8 @@ void register_whip_output()
 				 struct encoder_packet *packet) {
 		static_cast<WHIPOutput *>(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();
 	};

+ 3 - 1
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<WHIPService *>(priv_data)->server.c_str();
 	};