Adjust to refactor of variable string

src/utils/file-selection.cpp

@@ -24,7 +24,7 @@ FileSelection::FileSelection(FileSelection::Type type, QWidget *parent)
 	setLayout(layout);
 }
 
-void FileSelection::SetPath(const VariableResolvingString &path)
+void FileSelection::SetPath(const StringVariable &path)
 {
 	_filePath->setText(path);
 }

src/utils/file-selection.hpp

@@ -17,7 +17,7 @@ public:
 
 	FileSelection(FileSelection::Type type = FileSelection::Type::READ,
 		      QWidget *parent = 0);
-	void SetPath(const VariableResolvingString &);
+	void SetPath(const StringVariable &);
 	void SetPath(const QString &);
 	QPushButton *Button() { return _browseButton; }
 	static QString ValidPathOrDesktop(const QString &path);

src/utils/string-list.cpp

@@ -27,7 +27,7 @@ bool StringList::Load(obs_data_t *obj, const char *name,
 	size_t count = obs_data_array_count(strings);
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj = obs_data_array_item(strings, i);
-		VariableResolvingString string;
+		StringVariable string;
 		string.Load(array_obj, elementName);
 		*this << string;
 		obs_data_release(array_obj);
@@ -114,7 +114,7 @@ void StringListEdit::Add()
 	if (!accepted || name.empty()) {
 		return;
 	}
-	VariableResolvingString string = name;
+	StringVariable string = name;
 	QVariant v = QVariant::fromValue(string);
 	QListWidgetItem *item = new QListWidgetItem(
 		QString::fromStdString(string.UnresolvedValue()), _list);
@@ -179,7 +179,7 @@ void StringListEdit::Clicked(QListWidgetItem *item)
 		return;
 	}
 
-	VariableResolvingString string = name;
+	StringVariable string = name;
 	QVariant v = QVariant::fromValue(string);
 	item->setText(QString::fromStdString(string.UnresolvedValue()));
 	item->setData(Qt::UserRole, string);

src/utils/string-list.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "variable.hpp"
+#include "variable-string.hpp"
 
 #include <obs-data.h>
 #include <obs-module.h>
@@ -8,7 +8,7 @@
 #include <QListWidget>
 #include <QStringList>
 
-class StringList : public QList<VariableResolvingString> {
+class StringList : public QList<StringVariable> {
 public:
 	bool Save(obs_data_t *obj, const char *name,
 		  const char *elementName = "string") const;

src/utils/variable-line-edit.cpp

@@ -7,7 +7,7 @@ void VariableLineEdit::setText(const QString &string)
 	QLineEdit::setText(string);
 }
 
-void VariableLineEdit::setText(const VariableResolvingString &string)
+void VariableLineEdit::setText(const StringVariable &string)
 {
 	QLineEdit::setText(QString::fromStdString(string.UnresolvedValue()));
 }

src/utils/variable-line-edit.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "variable.hpp"
+#include "variable-string.hpp"
 
 #include <QLineEdit>
 
@@ -8,7 +8,7 @@ class VariableLineEdit : public QLineEdit {
 public:
 	VariableLineEdit(QWidget *parent);
 	void setText(const QString &);
-	void setText(const VariableResolvingString &);
+	void setText(const StringVariable &);
 
 private:
 };

src/utils/variable-text-edit.cpp

@@ -11,7 +11,7 @@ void VariableTextEdit::setPlainText(const QString &string)
 	QPlainTextEdit::setPlainText(string);
 }
 
-void VariableTextEdit::setPlainText(const VariableResolvingString &string)
+void VariableTextEdit::setPlainText(const StringVariable &string)
 {
 	QPlainTextEdit::setPlainText(
 		QString::fromStdString(string.UnresolvedValue()));

src/utils/variable-text-edit.hpp

@@ -1,13 +1,13 @@
 #pragma once
 #include "resizing-text-edit.hpp"
-#include "variable.hpp"
+#include "variable-string.hpp"
 
 class VariableTextEdit : public ResizingPlainTextEdit {
 	Q_OBJECT
 public:
 	VariableTextEdit(QWidget *parent);
 	void setPlainText(const QString &);
-	void setPlainText(const VariableResolvingString &);
+	void setPlainText(const StringVariable &);
 
 private:
 };