From cc188611117bdaa2679e6d53263ecbd14da5232c Mon Sep 17 00:00:00 2001 From: Martin Piatka Date: Thu, 12 Jan 2023 12:51:38 +0100 Subject: [PATCH] GUI: available_setting: Remove unused functionality --- gui/QT/option/available_settings.cpp | 31 ---------------------------- gui/QT/option/available_settings.hpp | 5 ----- 2 files changed, 36 deletions(-) diff --git a/gui/QT/option/available_settings.cpp b/gui/QT/option/available_settings.cpp index efd44160e..8f7d91d8b 100644 --- a/gui/QT/option/available_settings.cpp +++ b/gui/QT/option/available_settings.cpp @@ -1,7 +1,4 @@ -#include #include -#include -#include #include #include #include @@ -22,16 +19,6 @@ static bool vectorContains(const std::vector &v, const std::string return false; } -static QString getProcessOutput(const std::string& executable, const QStringList& args){ - QProcess process; - process.start(executable.c_str(), args); - process.waitForFinished(); - - QString output = QString(process.readAllStandardOutput()); - - return output; -} - struct { SettingType type; std::string_view capStr; @@ -135,19 +122,6 @@ void AvailableSettings::queryLine(std::string_view line){ (this->*parseFunc)(line); } -void AvailableSettings::queryFromString(const QString &string){ - QStringList lines = string.split(QRegularExpression("\n|\r\n|\r")); - - queryBegin(); - - for(int i = 0; i < lines.size(); i++){ - auto stdStr = lines[i].toStdString(); - queryLine(stdStr); - } - - queryEnd(); -} - static void maybeWriteString (const QJsonObject& obj, const char *key, std::string& result) @@ -157,11 +131,6 @@ static void maybeWriteString (const QJsonObject& obj, } } -void AvailableSettings::queryAll(const std::string &executable){ - QString output = getProcessOutput(executable, QStringList() << "--capabilities"); - queryFromString(output); -} - void AvailableSettings::queryVideoCompress(std::string_view line){ QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromRawData(line.data(), line.size())); if(!doc.isObject()) diff --git a/gui/QT/option/available_settings.hpp b/gui/QT/option/available_settings.hpp index b69ee6436..d78b669c1 100644 --- a/gui/QT/option/available_settings.hpp +++ b/gui/QT/option/available_settings.hpp @@ -5,7 +5,6 @@ #include #include #include -#include enum SettingType{ VIDEO_SRC = 0, @@ -72,9 +71,6 @@ struct CompressModule{ class AvailableSettings{ public: - void queryAll(const std::string &executable); - void queryFromString(const QString &string); - void queryBegin(); void queryLine(std::string_view line); void queryEnd(); @@ -99,7 +95,6 @@ private: void queryVideoCompress(std::string_view line); void parseStateVersion(std::string_view line); - //void parseStateParse(std::string_view line); void (AvailableSettings::*parseFunc)(std::string_view str) = nullptr;