From 951f0e0bbd76230c97b054fb19ab23464f8f77be Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 16 Nov 2017 20:41:58 +0200 Subject: [PATCH] Valgrind: Fix cyclic connect Editing the widget triggers rawPathChanged(), which calls setValgrindExecutable, which emits valgrindExecutableChanged(), which calls setPath on the widget. No other path reaches any of these functions. This causes the cursor to jump to the end, so if you want to change 'valgrind' to '/usr/local/bin/valgrind' you have to jump back after each character. Removed the now unused signal. Change-Id: Iaf4e902fb9a42975e9ada6662b7a64e53fab5cad Reviewed-by: hjk --- src/plugins/valgrind/valgrindconfigwidget.cpp | 2 -- src/plugins/valgrind/valgrindsettings.cpp | 5 +---- src/plugins/valgrind/valgrindsettings.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/valgrind/valgrindconfigwidget.cpp b/src/plugins/valgrind/valgrindconfigwidget.cpp index 37c1ad67a58..11352b30885 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.cpp +++ b/src/plugins/valgrind/valgrindconfigwidget.cpp @@ -62,8 +62,6 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings, connect(m_ui->valgrindExeChooser, &Utils::PathChooser::rawPathChanged, m_settings, &ValgrindBaseSettings::setValgrindExecutable); - connect(m_settings, &ValgrindBaseSettings::valgrindExecutableChanged, - m_ui->valgrindExeChooser, &Utils::PathChooser::setPath); connect(m_ui->smcDetectionComboBox, static_cast(&QComboBox::currentIndexChanged), m_settings, &ValgrindBaseSettings::setSelfModifyingCodeDetection); diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp index a494dbae3e1..08e2b627107 100644 --- a/src/plugins/valgrind/valgrindsettings.cpp +++ b/src/plugins/valgrind/valgrindsettings.cpp @@ -143,10 +143,7 @@ void ValgrindBaseSettings::toMap(QVariantMap &map) const void ValgrindBaseSettings::setValgrindExecutable(const QString &valgrindExecutable) { - if (m_valgrindExecutable != valgrindExecutable) { - m_valgrindExecutable = valgrindExecutable; - emit valgrindExecutableChanged(valgrindExecutable); - } + m_valgrindExecutable = valgrindExecutable; } void ValgrindBaseSettings::setSelfModifyingCodeDetection(int smcDetection) diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index b0d62e83172..4ec154158e0 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -78,7 +78,6 @@ public: void setSelfModifyingCodeDetection(int); signals: - void valgrindExecutableChanged(const QString &); void selfModifyingCodeDetectionChanged(int); private: