diff options
| author | hjk <hjk121@nokiamail.com> | 2014-10-22 23:16:33 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-10-22 23:15:49 +0200 |
| commit | cabf14ba3003e57cce2917f8fad50a09d3967f43 (patch) | |
| tree | 745e54a88f3fe52eed70c74d94445c459b56af0b | |
| parent | fd48d5e74099bb6f67c7677fbc9d4511213604d2 (diff) | |
| download | qt-creator-cabf14ba3003e57cce2917f8fad50a09d3967f43.tar.gz | |
Debugger: Use Qt5-style connects in DebuggerKitConfigWidget
Change-Id: I1cac24387cc74ade9113b4ecbe503871e9c6150b
Reviewed-by: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | src/plugins/debugger/debuggeritemmanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggeritemmanager.h | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerkitconfigwidget.cpp | 22 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index b13b97928a..55916a397e 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -123,7 +123,7 @@ DebuggerItemManager::DebuggerItemManager(QObject *parent) this, SLOT(saveDebuggers())); } -QObject *DebuggerItemManager::instance() +DebuggerItemManager *DebuggerItemManager::instance() { return m_instance; } diff --git a/src/plugins/debugger/debuggeritemmanager.h b/src/plugins/debugger/debuggeritemmanager.h index 1f165dbc1c..fae87b97c1 100644 --- a/src/plugins/debugger/debuggeritemmanager.h +++ b/src/plugins/debugger/debuggeritemmanager.h @@ -54,7 +54,7 @@ class DEBUGGER_EXPORT DebuggerItemManager : public QObject Q_OBJECT public: - static QObject *instance(); + static DebuggerItemManager *instance(); ~DebuggerItemManager(); static QList<DebuggerItem> debuggers(); diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index 60fa8256b0..fa4833c2fd 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -81,19 +81,21 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo m_comboBox->addItem(item.displayName(), item.id()); 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->setContentsMargins(0, 0, 0, 0); - connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageDebuggers())); - - 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))); + connect(m_manageButton, &QAbstractButton::clicked, + this, &DebuggerKitConfigWidget::manageDebuggers); + + DebuggerItemManager *manager = DebuggerItemManager::instance(); + connect(manager, &DebuggerItemManager::debuggerAdded, + this, &DebuggerKitConfigWidget::onDebuggerAdded); + connect(manager, &DebuggerItemManager::debuggerUpdated, + this, &DebuggerKitConfigWidget::onDebuggerUpdated); + connect(manager, &DebuggerItemManager::debuggerRemoved, + this, &DebuggerKitConfigWidget::onDebuggerRemoved); } DebuggerKitConfigWidget::~DebuggerKitConfigWidget() |