From 3c9346a219f5cfea3c94d209f87fa65d73e8579b Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Fri, 10 Apr 2015 10:17:44 +0200
Subject: [PATCH] De-QObjectify Settings class.
Change-Id: I67d6caff28f1196bec16cfef4dda6354700130f0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
.../clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp | 4 ++--
plugins/clangstaticanalyzer/clangstaticanalyzersettings.h | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
index 6b8b0f0cee2..ced034aa6c4 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
@@ -35,14 +35,14 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget(
m_ui->clangExecutableChooser->setPath(settings->clangExecutable());
connect(m_ui->clangExecutableChooser, &Utils::PathChooser::changed,
- m_settings, &ClangStaticAnalyzerSettings::setClangExecutable);
+ [settings](const QString &path) { settings->setClangExecutable(path); });
m_ui->simultaneousProccessesSpinBox->setValue(settings->simultaneousProcesses());
m_ui->simultaneousProccessesSpinBox->setMinimum(1);
m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount());
connect(m_ui->simultaneousProccessesSpinBox,
static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
- m_settings, &ClangStaticAnalyzerSettings::setSimultaneousProcesses);
+ [settings](int count) { settings->setSimultaneousProcesses(count); });
}
ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget()
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
index 71c4c218642..acd75458895 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
@@ -19,16 +19,13 @@
#ifndef CLANGSTATICANALYZERSETTINGS_H
#define CLANGSTATICANALYZERSETTINGS_H
-#include <QObject>
#include <QString>
namespace ClangStaticAnalyzer {
namespace Internal {
-class ClangStaticAnalyzerSettings : public QObject
+class ClangStaticAnalyzerSettings
{
- Q_OBJECT
-
public:
static ClangStaticAnalyzerSettings *instance();
--
GitLab