diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index a4a6e2d1835..7706ca12e68 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -169,7 +169,7 @@ FancyLineEdit::FancyLineEdit(QWidget *parent) : connect(d->m_iconbutton[Left], &QAbstractButton::clicked, this, &FancyLineEdit::iconClicked); connect(d->m_iconbutton[Right], &QAbstractButton::clicked, this, &FancyLineEdit::iconClicked); - connect(this, &QLineEdit::textChanged, this, &FancyLineEdit::onTextChanged); + connect(this, &QLineEdit::textChanged, this, &FancyLineEdit::validate); } FancyLineEdit::~FancyLineEdit() @@ -451,8 +451,10 @@ QString FancyLineEdit::errorMessage() const return d->m_errorMessage; } -void FancyLineEdit::onTextChanged(const QString &t) +void FancyLineEdit::validate() { + const QString t = text(); + if (d->m_isFiltering){ if (t != d->m_lastFilterText) { d->m_lastFilterText = t; @@ -498,17 +500,11 @@ void FancyLineEdit::onTextChanged(const QString &t) handleChanged(t); } -void FancyLineEdit::triggerChanged() -{ - onTextChanged(text()); -} - QString FancyLineEdit::fixInputString(const QString &string) { return string; } - // // IconButton - helper class to represent a clickable icon // diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index ff8f5cf3a21..9c9c1477ac1 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -143,16 +143,14 @@ public: QColor errorColor() const; void setErrorColor(const QColor &); - // Trigger an update (after changing settings) - void triggerChanged(); - static QColor textColor(const QWidget *w); static void setTextColor(QWidget *w, const QColor &c); void setValidationFunction(const ValidationFunction &fn); static ValidationFunction defaultValidationFunction(); + void validate(); -protected slots: +protected: // Custom behaviour can be added here. virtual void handleChanged(const QString &) {} @@ -166,17 +164,15 @@ signals: void validChanged(bool validState); void validReturnPressed(); -private slots: - void iconClicked(); - void onTextChanged(const QString &); - void onEditingFinished(); - protected: void resizeEvent(QResizeEvent *e); virtual QString fixInputString(const QString &string); private: + void iconClicked(); + void onEditingFinished(); + static bool validateWithValidator(FancyLineEdit *edit, QString *errorMessage); // Unimplemented, to force the user to make a decision on // whether to use setHistoryCompleter() or setSpecialCompleter(). diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp index dea3e69071c..7d3784b1d16 100644 --- a/src/libs/utils/newclasswidget.cpp +++ b/src/libs/utils/newclasswidget.cpp @@ -533,11 +533,6 @@ bool NewClassWidget::isValid(QString *error) const return true; } -void NewClassWidget::triggerUpdateFileNames() -{ - d->m_ui.classLineEdit->triggerChanged(); -} - void NewClassWidget::slotUpdateFileNames(const QString &baseName) { if (debugNewClassWidget) diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index 0f85de5fb14..1d286772d76 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -155,10 +155,6 @@ public slots: */ void suggestClassNameFromBase(); -public slots: - /** Trigger an update (after changing settings) */ - void triggerUpdateFileNames(); - private slots: void slotUpdateFileNames(const QString &t); void slotValidChanged(); diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 89c3e0c09fb..2ea0f591790 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -453,7 +453,7 @@ QString PathChooser::errorMessage() const void PathChooser::triggerChanged() { - d->m_lineEdit->triggerChanged(); + d->m_lineEdit->validate(); } void PathChooser::setAboutToShowContextMenuHandler(PathChooser::AboutToShowContextMenuHandler handler) @@ -616,7 +616,7 @@ void PathChooser::setExpectedKind(Kind expected) if (d->m_acceptingKind == expected) return; d->m_acceptingKind = expected; - d->m_lineEdit->triggerChanged(); + d->m_lineEdit->validate(); } PathChooser::Kind PathChooser::expectedKind() const