From 1a122c2e251649d78edb0f535222fd4359948ee2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 28 Apr 2015 14:50:47 +0200 Subject: [PATCH] Get rid of FancyLineEdit::validate Use aggregation instead of inheritance for customization of validation Change-Id: I5a9703bad5bace78e8c3cc1e2c353a734001bd0a Reviewed-by: Eike Ziller --- .../clangstaticanalyzerconfigwidget.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp index cb6c45c00b3..d73fd5436a2 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); });