debugger: work on action handling

src/plugins/debugger/debuggeractions.cpp

@@ -67,16 +67,13 @@ QVariant DebuggerAction::value() const
 
 void DebuggerAction::setValue(const QVariant &value, bool doemit)
 {
-    if (value != m_value) {
-        m_value = value;
-        if (this->isCheckable())
-            this->setChecked(m_value.toBool());
-        if (doemit) {
-            emit valueChanged(m_value);
-            emit boolValueChanged(m_value.toBool());
-            emit stringValueChanged(m_value.toString());
-        }
-    }
+    if (value == m_value)
+        return;
+    m_value = value;
+    if (this->isCheckable())
+        this->setChecked(m_value.toBool());
+    if (doemit)
+        emit valueChanged(m_value);
 }
 
 QVariant DebuggerAction::defaultValue() const

src/plugins/debugger/debuggeractions.h

@@ -84,8 +84,6 @@ public:
 
 signals:
     void valueChanged(const QVariant &newValue);
-    void boolValueChanged(bool newValue);
-    void stringValueChanged(const QString &newValue);
 
 private:
     Q_SLOT void uncheckableButtonClicked();

src/plugins/debugger/gdbengine.cpp

@@ -210,10 +210,10 @@ void GdbEngine::initializeConnections()
         q, SLOT(showApplicationOutput(QString)),
         Qt::QueuedConnection);
 
-    connect(theDebuggerAction(UseDumpers), SIGNAL(boolValueChanged(bool)),
-        this, SLOT(setUseDumpers(bool)));
-    connect(theDebuggerAction(DebugDumpers), SIGNAL(boolValueChanged(bool)),
-        this, SLOT(setDebugDumpers(bool)));
+    connect(theDebuggerAction(UseDumpers), SIGNAL(valueChanged(QVariant)),
+        this, SLOT(setUseDumpers(QVariant)));
+    connect(theDebuggerAction(DebugDumpers), SIGNAL(valueChanged(QVariant)),
+        this, SLOT(setDebugDumpers(QVariant)));
     connect(theDebuggerAction(RecheckDumpers), SIGNAL(triggered()),
         this, SLOT(recheckCustomDumperAvailability()));
 
@@ -1834,9 +1834,9 @@ void GdbEngine::setTokenBarrier()
     m_oldestAcceptableToken = currentToken();
 }
 
-void GdbEngine::setDebugDumpers(bool on)
+void GdbEngine::setDebugDumpers(const QVariant &on)
 {
-    if (on) {
+    if (on.toBool()) {
         debugMessage("SWITCHING ON DUMPER DEBUGGING");
         sendCommand("set unwindonsignal off");
         q->breakByFunction("qDumpObjectData440");
@@ -2849,10 +2849,9 @@ static void setWatchDataSAddress(WatchData &data, const GdbMi &mi)
         data.saddr = mi.data();
 }
 
-void GdbEngine::setUseDumpers(bool on)
+void GdbEngine::setUseDumpers(const QVariant &on)
 {
     qDebug() << "SWITCHING ON/OFF DUMPER DEBUGGING:" << on;
-    Q_UNUSED(on);
     // FIXME: a bit too harsh, but otherwise the treeview sometimes look funny
     //m_expandedINames.clear();
     setTokenBarrier();

src/plugins/debugger/gdbengine.h

@@ -130,8 +130,8 @@ private:
     void loadSymbols(const QString &moduleName);
     void loadAllSymbols();
 
-    Q_SLOT void setDebugDumpers(bool on);
-    Q_SLOT void setUseDumpers(bool on);
+    Q_SLOT void setDebugDumpers(const QVariant &on);
+    Q_SLOT void setUseDumpers(const QVariant &on);
 
     //
     // Own stuff