diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-28 14:50:47 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-06 18:50:07 +0300 |
commit | 1a122c2e251649d78edb0f535222fd4359948ee2 (patch) | |
tree | 976a98ea64af475e991d20e776fafe05fcdfc650 | |
parent | dca023a8551c8a20b33d846dae57dc522c68ebf9 (diff) |
Get rid of FancyLineEdit::validate
Use aggregation instead of inheritance for customization of validation
Change-Id: I5a9703bad5bace78e8c3cc1e2c353a734001bd0a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r-- | plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp index cb6c45c00b..d73fd5436a 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp @@ -40,10 +40,11 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget( chooser->setHistoryCompleter(QLatin1String("ClangStaticAnalyzer.ClangCommand.History")); chooser->setPromptDialogTitle(tr("Clang Command")); chooser->setPath(settings->clangExecutable()); - const auto validator = [chooser](const QString &, QString *errorMessage) { - return isClangExecutableUsable(chooser->fileName().toString(), errorMessage); + const auto validator = [chooser](Utils::FancyLineEdit *edit, QString *errorMessage) { + return chooser->defaultValidationFunction()(edit, errorMessage) + && isClangExecutableUsable(chooser->fileName().toString(), errorMessage); }; - chooser->setAdditionalPathValidator(validator); + chooser->setValidationFunction(validator); connect(m_ui->clangExecutableChooser, &Utils::PathChooser::changed, [settings](const QString &path) { settings->setClangExecutable(path); }); |