diff options
| author | David Schulz <david.schulz@qt.io> | 2019-03-28 09:36:01 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2019-04-23 06:44:42 +0000 |
| commit | b28501e3e977cf96cb55ded56f2b10b184996fcb (patch) | |
| tree | 0f95dc80686073ff316db3bb3199e71e6c2a4d6a /src/plugins/languageclient | |
| parent | e1deae844ea8deade44ff1e9c0ee865ae45a7794 (diff) | |
| download | qt-creator-b28501e3e977cf96cb55ded56f2b10b184996fcb.tar.gz | |
LanguageClient: remove unneeded forward delaration
Change-Id: I02e8dd07f8f04c82cdf31fc536c7d23924539296
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/languageclient')
| -rw-r--r-- | src/plugins/languageclient/languageclientsettings.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/languageclient/languageclientsettings.h | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 5f8dfceae3..c67b9a97a9 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -425,6 +425,12 @@ void BaseSettings::fromMap(const QVariantMap &map) m_languageFilter.filePattern = map[filePatternKey].toStringList(); } +static LanguageClientSettingsPage &settingsPage() +{ + static LanguageClientSettingsPage settingsPage; + return settingsPage; +} + void LanguageClientSettings::init() { settingsPage().init(); @@ -459,12 +465,6 @@ void LanguageClientSettings::toSettings(QSettings *settings, settings->endGroup(); } -LanguageClientSettingsPage &LanguageClientSettings::settingsPage() -{ - static LanguageClientSettingsPage settingsPage; - return settingsPage; -} - void StdIOSettings::applyFromSettingsWidget(QWidget *widget) { if (auto settingsWidget = qobject_cast<StdIOSettingsWidget *>(widget)) { diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h index 59f797e594..ddc0a2e386 100644 --- a/src/plugins/languageclient/languageclientsettings.h +++ b/src/plugins/languageclient/languageclientsettings.h @@ -117,8 +117,6 @@ protected: StdIOSettings &operator=(StdIOSettings &&other) = default; }; -class LanguageClientSettingsPage; - class LanguageClientSettings { public: @@ -126,9 +124,6 @@ public: static QList<BaseSettings *> fromSettings(QSettings *settings); static QList<BaseSettings *> currentPageSettings(); static void toSettings(QSettings *settings, const QList<BaseSettings *> &languageClientSettings); - -private: - static LanguageClientSettingsPage &settingsPage(); }; class BaseSettingsWidget : public QWidget |