From bf9777e7c686dd2a3da5011731c0065a4606ab1e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 24 Feb 2016 11:49:54 +0100 Subject: [PATCH] Fix Clang warnings Do not hide virtual done() slot with done() signal. Change-Id: Ic09439fdac2727f316f4a0983ffbd290f8555292 Reviewed-by: Tobias Hunger --- .../components/componentcore/addsignalhandlerdialog.cpp | 2 +- .../components/componentcore/addsignalhandlerdialog.h | 2 +- .../components/componentcore/modelnodeoperations.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp index 93177329ecd..190d69db110 100644 --- a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp +++ b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.cpp @@ -74,5 +74,5 @@ void AddSignalHandlerDialog::updateComboBox() void AddSignalHandlerDialog::handleAccepted() { m_signal = m_ui->comboBox->currentText(); - emit done(); + emit signalSelected(); } diff --git a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.h b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.h index 08850df9af0..da9fa05891c 100644 --- a/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.h +++ b/src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.h @@ -43,7 +43,7 @@ public: QString signal() const; signals: - void done(); + void signalSelected(); private: void updateComboBox(); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 8d8d4c2911a..1e8ac14f936 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -695,7 +695,7 @@ void gotoImplementation(const SelectionContext &selectionState) AddSignalHandlerDialog *dialog = new AddSignalHandlerDialog(Core::ICore::dialogParent()); dialog->setSignals(signalNames); - AddSignalHandlerDialog::connect(dialog, &AddSignalHandlerDialog::done, [=] { + AddSignalHandlerDialog::connect(dialog, &AddSignalHandlerDialog::signalSelected, [=] { dialog->deleteLater(); if (dialog->signal().isEmpty())