feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Rewrite logic to use signals on DebuggerItemManager

Browse Source 
Change-Id: I82e1cd3cca9cc2d79366e1af054640dadebf7871
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-10-28 14:05:12 +01:00
committed by hjk
parent 5e1e8eaae0
commit b17e8e3061
7 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/debuggerkitconfigwidget.cpp
View File

@@ -31,6 +31,7 @@
#include "debuggeritemmanager.h"
#include "debuggeritemmodel.h"
#include "debuggerkitinformation.h"
#include <coreplugin/icore.h>
@@ -78,9 +79,6 @@ class DebuggerItemConfigWidget;
DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInformation *ki)
: KitConfigWidget(workingCopy, ki)
{
DebuggerItemModel *model = DebuggerItemManager::model();
QTC_CHECK(model);
m_comboBox = new QComboBox;
m_comboBox->setEnabled(true);
m_comboBox->setToolTip(toolTip());
@@ -95,11 +93,12 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo
m_manageButton->setContentsMargins(0, 0, 0, 0);
connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageDebuggers()));
connect(model, SIGNAL(debuggerAdded(QVariant,QString)),
this, SLOT(onDebuggerAdded(QVariant,QString)));
connect(model, SIGNAL(debuggerUpdated(QVariant,QString)),
this, SLOT(onDebuggerUpdated(QVariant,QString)));
connect(model, SIGNAL(debuggerRemoved(QVariant)),
QObject *manager = DebuggerItemManager::instance();
connect(manager, SIGNAL(debuggerAdded(QVariant)),
this, SLOT(onDebuggerAdded(QVariant)));
connect(manager, SIGNAL(debuggerUpdated(QVariant)),
this, SLOT(onDebuggerUpdated(QVariant)));
connect(manager, SIGNAL(debuggerRemoved(QVariant)),
this, SLOT(onDebuggerRemoved(QVariant)));
}
@@ -154,20 +153,22 @@ void DebuggerKitConfigWidget::currentDebuggerChanged(int)
m_kit->setValue(DebuggerKitInformation::id(), id);
}
void DebuggerKitConfigWidget::onDebuggerAdded(const QVariant &id, const QString &displayName)
void DebuggerKitConfigWidget::onDebuggerAdded(const QVariant &id)
{
m_comboBox->setEnabled(true);
m_comboBox->addItem(displayName, id);
const DebuggerItem *item = DebuggerItemManager::findById(id);
QTC_ASSERT(item, return);
m_comboBox->addItem(item->displayName(), id);
updateComboBox(id);
}
void DebuggerKitConfigWidget::onDebuggerUpdated(const QVariant &id, const QString &displayName)
void DebuggerKitConfigWidget::onDebuggerUpdated(const QVariant &id)
{
m_comboBox->setEnabled(true);
const DebuggerItem *item = DebuggerItemManager::findById(id);
QTC_ASSERT(item, return);
const int pos = indexOf(id);
if (pos < 0)
return;
m_comboBox->setItemText(pos, displayName);
m_comboBox->setItemText(pos, item->displayName());
}
void DebuggerKitConfigWidget::onDebuggerRemoved(const QVariant &id)