diff --git a/src/plugins/boot2qt/device-detection/hostmessages.cpp b/src/plugins/boot2qt/device-detection/hostmessages.cpp index c8343bab88d..9b4864c77a8 100644 --- a/src/plugins/boot2qt/device-detection/hostmessages.cpp +++ b/src/plugins/boot2qt/device-detection/hostmessages.cpp @@ -5,6 +5,8 @@ #include +const int qdbHostMessageVersion = 1; + const QString responseField = "response"; const QString requestField = "request"; const QString versionField = "_version"; @@ -14,39 +16,7 @@ void setVersionField(QJsonObject &obj) obj[versionField] = qdbHostMessageVersion; } -bool checkHostMessageVersion(const QJsonObject &obj) -{ - return obj[versionField].toInt() == qdbHostMessageVersion; -} - -QByteArray createRequest(const RequestType &type) -{ - QJsonObject obj; - setVersionField(obj); - obj[requestField] = requestTypeString(type); - return QJsonDocument{obj}.toJson(QJsonDocument::Compact).append('\n'); -} - -RequestType requestType(const QJsonObject &obj) -{ - const auto fieldValue = obj[requestField]; - if (fieldValue == requestTypeString(RequestType::Devices)) - return RequestType::Devices; - if (fieldValue == requestTypeString(RequestType::WatchDevices)) - return RequestType::WatchDevices; - if (fieldValue == requestTypeString(RequestType::StopServer)) - return RequestType::StopServer; - if (fieldValue == requestTypeString(RequestType::Messages)) - return RequestType::Messages; - if (fieldValue == requestTypeString(RequestType::WatchMessages)) - return RequestType::WatchMessages; - if (fieldValue == requestTypeString(RequestType::MessagesAndClear)) - return RequestType::MessagesAndClear; - - return RequestType::Unknown; -} - -QString requestTypeString(const RequestType &type) +static QString requestTypeString(const RequestType &type) { switch (type) { case RequestType::Devices: @@ -64,15 +34,15 @@ QString requestTypeString(const RequestType &type) case RequestType::Unknown: break; } - QTC_ASSERT(false, return QString()); + QTC_ASSERT(false, return {}); } -QJsonObject initializeResponse(const ResponseType &type) +QByteArray createRequest(const RequestType &type) { QJsonObject obj; setVersionField(obj); - obj[responseField] = responseTypeString(type); - return obj; + obj[requestField] = requestTypeString(type); + return QJsonDocument{obj}.toJson(QJsonDocument::Compact).append('\n'); } ResponseType responseType(const QJsonObject &obj) @@ -118,8 +88,3 @@ QString responseTypeString(const ResponseType &type) } QTC_ASSERT(false, return QString()); } - -QByteArray serialiseResponse(const QJsonObject &obj) -{ - return QJsonDocument{obj}.toJson(QJsonDocument::Compact).append('\n'); -} diff --git a/src/plugins/boot2qt/device-detection/hostmessages.h b/src/plugins/boot2qt/device-detection/hostmessages.h index ea98c9bcc97..c78f55ec4cf 100644 --- a/src/plugins/boot2qt/device-detection/hostmessages.h +++ b/src/plugins/boot2qt/device-detection/hostmessages.h @@ -7,9 +7,6 @@ #include #include -const int qdbHostMessageVersion = 1; -bool checkHostMessageVersion(const QJsonObject &obj); - enum class RequestType { Unknown = 0, @@ -22,8 +19,6 @@ enum class RequestType }; QByteArray createRequest(const RequestType &type); -RequestType requestType(const QJsonObject &obj); -QString requestTypeString(const RequestType &type); enum class ResponseType { @@ -37,7 +32,5 @@ enum class ResponseType Messages, }; -QJsonObject initializeResponse(const ResponseType &type); ResponseType responseType(const QJsonObject &obj); QString responseTypeString(const ResponseType &type); -QByteArray serialiseResponse(const QJsonObject &obj); diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp index cbeb71c4d10..85078285ecd 100644 --- a/src/plugins/boot2qt/qdbrunconfiguration.cpp +++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp @@ -89,11 +89,6 @@ private: return tasks; } - QString defaultDisplayName() const - { - return RunConfigurationFactory::decoratedTargetName(buildKey(), target()); - } - ExecutableAspect executable{this}; SymbolFileAspect symbolFile{this}; RemoteLinux::RemoteLinuxEnvironmentAspect environment{this};