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

LanguageClient: remove unneeded forward delaration

Browse Source 
Change-Id: I02e8dd07f8f04c82cdf31fc536c7d23924539296
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
David Schulz
2019-03-28 09:36:01 +01:00
parent e1deae844e
commit b28501e3e9
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,6 +425,12 @@ void BaseSettings::fromMap(const QVariantMap &map)
m_languageFilter.filePattern = map[filePatternKey].toStringList(); m_languageFilter.filePattern = map[filePatternKey].toStringList();
} }
static LanguageClientSettingsPage &settingsPage()
{
static LanguageClientSettingsPage settingsPage;
return settingsPage;
}
void LanguageClientSettings::init() void LanguageClientSettings::init()
{ {
settingsPage().init(); settingsPage().init();
@@ -459,12 +465,6 @@ void LanguageClientSettings::toSettings(QSettings *settings,
settings->endGroup(); settings->endGroup();
} }
LanguageClientSettingsPage &LanguageClientSettings::settingsPage()
{
static LanguageClientSettingsPage settingsPage;
return settingsPage;
}
void StdIOSettings::applyFromSettingsWidget(QWidget *widget) void StdIOSettings::applyFromSettingsWidget(QWidget *widget)
{ {
if (auto settingsWidget = qobject_cast<StdIOSettingsWidget *>(widget)) { if (auto settingsWidget = qobject_cast<StdIOSettingsWidget *>(widget)) {

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

@@ -117,8 +117,6 @@ protected:
StdIOSettings &operator=(StdIOSettings &&other) = default; StdIOSettings &operator=(StdIOSettings &&other) = default;
}; };
class LanguageClientSettingsPage;
class LanguageClientSettings class LanguageClientSettings
{ {
public: public:
@@ -126,9 +124,6 @@ public:
static QList<BaseSettings *> fromSettings(QSettings *settings); static QList<BaseSettings *> fromSettings(QSettings *settings);
static QList<BaseSettings *> currentPageSettings(); static QList<BaseSettings *> currentPageSettings();
static void toSettings(QSettings *settings, const QList<BaseSettings *> &languageClientSettings); static void toSettings(QSettings *settings, const QList<BaseSettings *> &languageClientSettings);
private:
static LanguageClientSettingsPage &settingsPage();
}; };
class BaseSettingsWidget : public QWidget class BaseSettingsWidget : public QWidget