diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp index 94c83a0e9dd..3161754a148 100644 --- a/src/libs/utils/savedaction.cpp +++ b/src/libs/utils/savedaction.cpp @@ -196,8 +196,6 @@ void SavedAction::readSettings(const QSettings *settings) if (isCheckable() && !var.isValid()) var = false; setValue(var); - //qDebug() << "READING: " << var.isValid() << m_settingsKey << " -> " << m_value - // << " (default: " << m_defaultValue << ")" << var; } /* @@ -212,7 +210,6 @@ void SavedAction::writeSettings(QSettings *settings) return; settings->beginGroup(m_settingsGroup); settings->setValue(m_settingsKey, m_value); - //qDebug() << "WRITING: " << m_settingsKey << " -> " << toString(); settings->endGroup(); } @@ -242,12 +239,10 @@ void SavedAction::connectWidget(QWidget *widget, ApplyMode applyMode) this, &SavedAction::checkableButtonClicked); } else if (QSpinBox *spinBox = qobject_cast(widget)) { spinBox->setValue(m_value.toInt()); - //qDebug() << "SETTING VALUE" << spinBox->value(); connect(spinBox, static_cast(&QSpinBox::valueChanged), this, &SavedAction::spinBoxValueChanged); } else if (QLineEdit *lineEdit = qobject_cast(widget)) { lineEdit->setText(m_value.toString()); - //qDebug() << "SETTING TEXT" << lineEdit->text(); connect(lineEdit, &QLineEdit::editingFinished, this, &SavedAction::lineEditEditingFinished); } else if (PathChooser *pathChooser = qobject_cast(widget)) { @@ -309,7 +304,6 @@ void SavedAction::checkableButtonClicked(bool) { QCheckBox *button = qobject_cast(sender()); QTC_ASSERT(button, return); - //qDebug() << "CHECKABLE BUTTON: " << sender(); if (m_applyMode == ImmediateApply) setValue(button->isChecked()); } diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h index ed4450e99f5..c8720f63652 100644 --- a/src/libs/utils/savedaction.h +++ b/src/libs/utils/savedaction.h @@ -51,27 +51,27 @@ public: SavedAction(QObject *parent = 0); QVariant value() const; - Q_SLOT void setValue(const QVariant &value, bool doemit = true); + void setValue(const QVariant &value, bool doemit = true); QVariant defaultValue() const; - Q_SLOT void setDefaultValue(const QVariant &value); + void setDefaultValue(const QVariant &value); - Q_SLOT void trigger(const QVariant &data); + void trigger(const QVariant &data); // used for persistency QString settingsKey() const; - Q_SLOT void setSettingsKey(const QString &key); - Q_SLOT void setSettingsKey(const QString &group, const QString &key); + void setSettingsKey(const QString &key); + void setSettingsKey(const QString &group, const QString &key); QString settingsGroup() const; - Q_SLOT void setSettingsGroup(const QString &group); + void setSettingsGroup(const QString &group); virtual void readSettings(const QSettings *settings); - Q_SLOT virtual void writeSettings(QSettings *settings); + virtual void writeSettings(QSettings *settings); void connectWidget(QWidget *widget, ApplyMode applyMode = DeferedApply); void disconnectWidget(); - Q_SLOT void apply(QSettings *settings); + void apply(QSettings *settings); QString toString() const; diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp index 138daa0df58..cf1357df484 100644 --- a/src/plugins/debugger/registerpostmortemaction.cpp +++ b/src/plugins/debugger/registerpostmortemaction.cpp @@ -75,7 +75,7 @@ void RegisterPostMortemAction::registerNow(const QVariant &value) RegisterPostMortemAction::RegisterPostMortemAction(QObject *parent) : Utils::SavedAction(parent) { - connect(this, SIGNAL(valueChanged(QVariant)), SLOT(registerNow(QVariant))); + connect(this, &SavedAction::valueChanged, this, &RegisterPostMortemAction::registerNow); } void RegisterPostMortemAction::readSettings(const QSettings *) diff --git a/src/plugins/debugger/registerpostmortemaction.h b/src/plugins/debugger/registerpostmortemaction.h index 8e25ef754c7..edee314dcb7 100644 --- a/src/plugins/debugger/registerpostmortemaction.h +++ b/src/plugins/debugger/registerpostmortemaction.h @@ -38,14 +38,13 @@ namespace Internal { class RegisterPostMortemAction : public Utils::SavedAction { - Q_OBJECT - -private: - Q_SLOT void registerNow(const QVariant &value); public: RegisterPostMortemAction(QObject *parent = 0); - void readSettings(const QSettings *settings = 0); - Q_SLOT virtual void writeSettings(QSettings *) {} + void readSettings(const QSettings *settings = 0) override; + void writeSettings(QSettings *) override {} + +private: + void registerNow(const QVariant &value); }; } // namespace Internal