feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LSP: make fromMap() a non static member function

Browse Source 
Change-Id: I24844cae784921e0128f475b792453fa65c566ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2018-09-17 15:29:05 +02:00
parent 898bd4aa68
commit f5843a29bc
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -341,7 +341,9 @@ void LanguageClientSettingsModel::fromSettings(QSettings *settings)
auto variants = settings->value(clientsKey).toList(); auto variants = settings->value(clientsKey).toList();
m_settings.reserve(variants.size()); m_settings.reserve(variants.size());
m_settings = Utils::transform(variants, [](const QVariant& var){ m_settings = Utils::transform(variants, [](const QVariant& var){
return new BaseSettings(BaseSettings::fromMap(var.toMap())); auto settings = new BaseSettings();
settings->fromMap(var.toMap());
return settings;
}); });
settings->endGroup(); settings->endGroup();
} }
@@ -402,13 +404,13 @@ QVariantMap BaseSettings::toMap() const
return map; return map;
} }
BaseSettings BaseSettings::fromMap(const QVariantMap &map) void BaseSettings::fromMap(const QVariantMap &map)
{ {
return { map[nameKey].toString(), m_name = map[nameKey].toString();
map[enabledKey].toBool(), m_enabled = map[enabledKey].toBool();
map[mimeTypeKey].toString(), m_mimeType = map[mimeTypeKey].toString();
map[executableKey].toString(), m_executable = map[executableKey].toString();
map[argumentsKey].toString() }; m_arguments = map[argumentsKey].toString();
} }
void LanguageClientSettings::init() void LanguageClientSettings::init()

3
src/plugins/languageclient/languageclientsettings.h
View File

@@ -66,8 +66,7 @@ public:
BaseClient *createClient(); BaseClient *createClient();
QVariantMap toMap() const; QVariantMap toMap() const;
static BaseSettings fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map);
}; };
} // namespace LanguageClient } // namespace LanguageClient