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

Debugger: Use Qt5-style connects in DebuggerKitConfigWidget

Browse Source 
Change-Id: I1cac24387cc74ade9113b4ecbe503871e9c6150b
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-10-22 23:16:33 +02:00
parent fd48d5e740
commit cabf14ba30
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -123,7 +123,7 @@ DebuggerItemManager::DebuggerItemManager(QObject *parent)
this, SLOT(saveDebuggers())); this, SLOT(saveDebuggers()));
} }
QObject *DebuggerItemManager::instance() DebuggerItemManager *DebuggerItemManager::instance()
{ {
return m_instance; return m_instance;
} }

2
src/plugins/debugger/debuggeritemmanager.h
View File

@@ -54,7 +54,7 @@ class DEBUGGER_EXPORT DebuggerItemManager : public QObject
Q_OBJECT Q_OBJECT
public: public:
static QObject *instance(); static DebuggerItemManager *instance();
~DebuggerItemManager(); ~DebuggerItemManager();
static QList<DebuggerItem> debuggers(); static QList<DebuggerItem> debuggers();

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

@@ -81,19 +81,21 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo
m_comboBox->addItem(item.displayName(), item.id()); m_comboBox->addItem(item.displayName(), item.id());
refresh(); refresh();
connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(currentDebuggerChanged(int))); connect(m_comboBox, &QComboBox::currentIndexChanged,
this, &DebuggerKitConfigWidget::currentDebuggerChanged);
m_manageButton = new QPushButton(KitConfigWidget::msgManage()); m_manageButton = new QPushButton(KitConfigWidget::msgManage());
m_manageButton->setContentsMargins(0, 0, 0, 0); m_manageButton->setContentsMargins(0, 0, 0, 0);
connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageDebuggers())); connect(m_manageButton, &QAbstractButton::clicked,
this, &DebuggerKitConfigWidget::manageDebuggers);
QObject *manager = DebuggerItemManager::instance(); DebuggerItemManager *manager = DebuggerItemManager::instance();
connect(manager, SIGNAL(debuggerAdded(QVariant)), connect(manager, &DebuggerItemManager::debuggerAdded,
this, SLOT(onDebuggerAdded(QVariant))); this, &DebuggerKitConfigWidget::onDebuggerAdded);
connect(manager, SIGNAL(debuggerUpdated(QVariant)), connect(manager, &DebuggerItemManager::debuggerUpdated,
this, SLOT(onDebuggerUpdated(QVariant))); this, &DebuggerKitConfigWidget::onDebuggerUpdated);
connect(manager, SIGNAL(debuggerRemoved(QVariant)), connect(manager, &DebuggerItemManager::debuggerRemoved,
this, SLOT(onDebuggerRemoved(QVariant))); this, &DebuggerKitConfigWidget::onDebuggerRemoved);
} }
DebuggerKitConfigWidget::~DebuggerKitConfigWidget() DebuggerKitConfigWidget::~DebuggerKitConfigWidget()