Split utility headers

plugins/base/utils/connection-manager.cpp

@@ -1,8 +1,9 @@
 #include "connection-manager.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "name-dialog.hpp"
 #include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
-#include "name-dialog.hpp"
+#include "ui-helpers.hpp"
 
 #include <algorithm>
 #include <QAction>

plugins/base/utils/filter-selection.cpp

@@ -1,6 +1,8 @@
 #include "filter-selection.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "ui-helpers.hpp"
 #include "variable.hpp"
 
 namespace advss {
@@ -164,6 +166,25 @@ void FilterSelectionWidget::Reset()
 	SetFilter(_source, previousSelection);
 }
 
+static QStringList getFilterNames(OBSWeakSource weakSource)
+{
+	if (!weakSource) {
+		return {};
+	}
+
+	QStringList list;
+	auto enumFilters = [](obs_source_t *, obs_source_t *filter, void *ptr) {
+		auto name = obs_source_get_name(filter);
+		QStringList *list = reinterpret_cast<QStringList *>(ptr);
+		*list << QString(name);
+	};
+
+	auto s = obs_weak_source_get_source(weakSource);
+	obs_source_enum_filters(s, enumFilters, &list);
+	obs_source_release(s);
+	return list;
+}
+
 void FilterSelectionWidget::PopulateSelection()
 {
 	const QSignalBlocker b(this);
@@ -180,7 +201,7 @@ void FilterSelectionWidget::PopulateSelection()
 	}
 	_variablesEndIdx = count();
 
-	AddSelectionGroup(this, GetFilterNames(_source.GetSource()));
+	AddSelectionGroup(this, getFilterNames(_source.GetSource()));
 	_filterEndIdx = count();
 
 	// Remove last separator

plugins/base/utils/osc-helpers.cpp

@@ -1,9 +1,10 @@
 #include "osc-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "ui-helpers.hpp"
 
-#include <string.h>
 #include <QGroupBox>
+#include <QLayout>
+#include <string.h>
 
 #ifdef WIN32
 #include <winsock.h>

plugins/base/utils/process-config.cpp

@@ -1,10 +1,10 @@
 #include "process-config.hpp"
+#include "layout-helpers.hpp"
 #include "log-helper.hpp"
 #include "name-dialog.hpp"
-#include "utility.hpp"
 
-#include <QProcess>
 #include <QFileDialog>
+#include <QProcess>
 
 namespace advss {
 

plugins/base/utils/profile-helpers.cpp

@@ -1,6 +1,6 @@
 #include "profile-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 #include <obs-frontend-api.h>
 

plugins/base/utils/scene-item-selection.cpp

@@ -1,5 +1,9 @@
 #include "scene-item-selection.hpp"
+#include "layout-helpers.hpp"
 #include "obs-module-helper.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "ui-helpers.hpp"
 
 #include <set>
 

plugins/base/utils/scene-item-selection.hpp

@@ -5,9 +5,9 @@
 #include "variable-line-edit.hpp"
 #include "variable-string.hpp"
 #include "regex-config.hpp"
-#include "utility.hpp"
 
 #include <obs-data.h>
+#include <QLayout>
 
 namespace advss {
 

plugins/base/utils/source-setting.cpp

@@ -1,9 +1,11 @@
 #include "source-setting.hpp"
 #include "obs-module-helper.hpp"
 #include "math-helpers.hpp"
+#include "ui-helpers.hpp"
 #include "utility.hpp"
 
 #include <nlohmann/json.hpp>
+#include <QLayout>
 
 Q_DECLARE_METATYPE(advss::SourceSetting);
 

plugins/base/utils/string-list.cpp

@@ -1,6 +1,6 @@
 #include "string-list.hpp"
 #include "name-dialog.hpp"
-#include "utility.hpp"
+#include "ui-helpers.hpp"
 
 #include <QLayout>
 #include <QTimer>

plugins/base/utils/transition-selection.cpp

@@ -1,6 +1,9 @@
 #include "transition-selection.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {