diff --git a/src/gui/src/WebClient.cpp b/src/gui/src/WebClient.cpp index 8f2e77ed..f9ae1843 100644 --- a/src/gui/src/WebClient.cpp +++ b/src/gui/src/WebClient.cpp @@ -89,56 +89,6 @@ int WebClient::getEdition( return edition; } -void WebClient::queryPluginList() -{ - QString responseJson; - try { - QStringList args("--get-plugin-list"); - responseJson = request(m_Email, m_Password, args); - } - catch (std::exception& e) - { - emit error(tr("An error occurred while trying to query the " - "plugin list. Please contact the help desk, and " - "provide the following details.\n\n%1").arg(e.what())); - return; - } - - QRegExp resultRegex(".*\"result\".*:.*(true|false).*"); - if (resultRegex.exactMatch(responseJson)) { - QString boolString = resultRegex.cap(1); - if (boolString == "true") { - QRegExp editionRegex(".*\"plugins\".*:.*\"([^\"]+)\".*"); - if (editionRegex.exactMatch(responseJson)) { - QString e = editionRegex.cap(1); - m_PluginList = e.split(","); - } - emit queryPluginDone(); - return; - } - else if (boolString == "false") { - emit error(tr("Get plugin list failed, invalid user email " - "or password.")); - return; - } - } - else { - QRegExp errorRegex(".*\"error\".*:.*\"([^\"]+)\".*"); - if (errorRegex.exactMatch(responseJson)) { - - // replace "\n" with real new lines. - QString e = errorRegex.cap(1).replace("\\n", "\n"); - emit error(tr("Get plugin list failed, an error occurred." - "\n\n%1").arg(e)); - return; - } - } - - emit error(tr("Get plugin list failed, an error occurred.\n\n" - "Server response:\n\n%1").arg(responseJson)); - return; -} - QString WebClient::request( const QString& email, const QString& password, diff --git a/src/gui/src/WebClient.h b/src/gui/src/WebClient.h index b36162da..7eecc845 100644 --- a/src/gui/src/WebClient.h +++ b/src/gui/src/WebClient.h @@ -39,14 +39,9 @@ public: QWidget* w); void setEmail(QString& e) { m_Email = e; } void setPassword(QString& p) { m_Password = p; } - QStringList& getPluginList() { return m_PluginList; } - -public slots: - void queryPluginList(); signals: void error(QString e); - void queryPluginDone(); private: QString request(const QString& email, @@ -56,7 +51,6 @@ private: private: QString m_Email; QString m_Password; - QStringList m_PluginList; CoreInterface m_CoreInterface; };