From b28501e3e977cf96cb55ded56f2b10b184996fcb Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 28 Mar 2019 09:36:01 +0100 Subject: [PATCH] LanguageClient: remove unneeded forward delaration Change-Id: I02e8dd07f8f04c82cdf31fc536c7d23924539296 Reviewed-by: Christian Stenger Reviewed-by: David Schulz --- .../languageclient/languageclientsettings.cpp | 12 ++++++------ 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 5f8dfceae3c..c67b9a97a96 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(widget)) { diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h index 59f797e5945..ddc0a2e386d 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 fromSettings(QSettings *settings); static QList currentPageSettings(); static void toSettings(QSettings *settings, const QList &languageClientSettings); - -private: - static LanguageClientSettingsPage &settingsPage(); }; class BaseSettingsWidget : public QWidget