forked from qt-creator/qt-creator
Python: use consistent pyls naming in settings
Change-Id: I8a36e4089812802c3629ac52ce52499dde53eba8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -193,7 +193,7 @@ PyLSClient::~PyLSClient()
|
|||||||
|
|
||||||
void PyLSClient::updateConfiguration()
|
void PyLSClient::updateConfiguration()
|
||||||
{
|
{
|
||||||
const auto doc = QJsonDocument::fromJson(PythonSettings::pyLSConfiguration().toUtf8());
|
const auto doc = QJsonDocument::fromJson(PythonSettings::pylsConfiguration().toUtf8());
|
||||||
if (doc.isArray())
|
if (doc.isArray())
|
||||||
Client::updateConfiguration(doc.array());
|
Client::updateConfiguration(doc.array());
|
||||||
else if (doc.isObject())
|
else if (doc.isObject())
|
||||||
|
@@ -855,7 +855,7 @@ bool PythonSettings::pylsEnabled()
|
|||||||
return pylspOptionsPage().enabled();
|
return pylspOptionsPage().enabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString PythonSettings::pyLSConfiguration()
|
QString PythonSettings::pylsConfiguration()
|
||||||
{
|
{
|
||||||
return pylspOptionsPage().configuration();
|
return pylspOptionsPage().configuration();
|
||||||
}
|
}
|
||||||
|
@@ -26,7 +26,7 @@ public:
|
|||||||
static void setPyLSConfiguration(const QString &configuration);
|
static void setPyLSConfiguration(const QString &configuration);
|
||||||
static bool pylsEnabled();
|
static bool pylsEnabled();
|
||||||
static void setPylsEnabled(const bool &enabled);
|
static void setPylsEnabled(const bool &enabled);
|
||||||
static QString pyLSConfiguration();
|
static QString pylsConfiguration();
|
||||||
static PythonSettings *instance();
|
static PythonSettings *instance();
|
||||||
|
|
||||||
static QList<Interpreter> detectPythonVenvs(const Utils::FilePath &path);
|
static QList<Interpreter> detectPythonVenvs(const Utils::FilePath &path);
|
||||||
|
Reference in New Issue
Block a user