From c3acbc46edb1997fcf690e910e4eefee51c8c243 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 1 Jul 2016 16:07:18 +0300 Subject: [PATCH] CrashHandler: Use Qt5-style connects The heavy lifting was done by clazy. Change-Id: I236fca3e8741d0e8ff510045dc7e51dda076546a Reviewed-by: Nikolai Kosjar --- .../qtcreatorcrashhandler/backtracecollector.cpp | 13 ++++++++----- .../qtcreatorcrashhandler/backtracecollector.h | 3 +-- src/tools/qtcreatorcrashhandler/crashhandler.cpp | 8 +++++--- src/tools/qtcreatorcrashhandler/crashhandler.h | 1 - .../qtcreatorcrashhandler/crashhandlerdialog.cpp | 11 +++++++---- .../qtcreatorcrashhandler/crashhandlerdialog.h | 3 +-- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp index 7663c22b81e..014b387eee2 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp @@ -49,11 +49,14 @@ public: BacktraceCollector::BacktraceCollector(QObject *parent) : QObject(parent), d(new BacktraceCollectorPrivate) { - connect(&d->debugger, SIGNAL(finished(int,QProcess::ExitStatus)), - SLOT(onDebuggerFinished(int,QProcess::ExitStatus))); - connect(&d->debugger, SIGNAL(error(QProcess::ProcessError)), - SLOT(onDebuggerError(QProcess::ProcessError))); - connect(&d->debugger, SIGNAL(readyRead()), SLOT(onDebuggerOutputAvailable())); + connect(&d->debugger, + static_cast(&QProcess::finished), + this, &BacktraceCollector::onDebuggerFinished); + connect(&d->debugger, + static_cast(&QProcess::error), + this, &BacktraceCollector::onDebuggerError); + connect(&d->debugger, &QIODevice::readyRead, + this, &BacktraceCollector::onDebuggerOutputAvailable); d->debugger.setProcessChannelMode(QProcess::MergedChannels); } diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.h b/src/tools/qtcreatorcrashhandler/backtracecollector.h index 1fdb1eb2dff..50d0bee0560 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.h +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.h @@ -45,12 +45,11 @@ signals: void backtrace(const QString &backtrace); void backtraceChunk(const QString &chunk); -private slots: +private: void onDebuggerOutputAvailable(); void onDebuggerFinished(int exitCode, QProcess::ExitStatus exitStatus); void onDebuggerError(QProcess::ProcessError err); -private: QString createTemporaryCommandFile(); BacktraceCollectorPrivate *d; diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.cpp b/src/tools/qtcreatorcrashhandler/crashhandler.cpp index fd5c589ab97..a11c29c95f1 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandler.cpp @@ -103,9 +103,11 @@ public: CrashHandler::CrashHandler(pid_t pid, const QString &signalName, QObject *parent) : QObject(parent), d(new CrashHandlerPrivate(pid, signalName, this)) { - connect(&d->backtraceCollector, SIGNAL(error(QString)), SLOT(onError(QString))); - connect(&d->backtraceCollector, SIGNAL(backtraceChunk(QString)), SLOT(onBacktraceChunk(QString))); - connect(&d->backtraceCollector, SIGNAL(backtrace(QString)), SLOT(onBacktraceFinished(QString))); + connect(&d->backtraceCollector, &BacktraceCollector::error, this, &CrashHandler::onError); + connect(&d->backtraceCollector, &BacktraceCollector::backtraceChunk, + this, &CrashHandler::onBacktraceChunk); + connect(&d->backtraceCollector, &BacktraceCollector::backtrace, + this, &CrashHandler::onBacktraceFinished); d->dialog.appendDebugInfo(collectKernelVersionInfo()); d->dialog.appendDebugInfo(collectLinuxDistributionInfo()); diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.h b/src/tools/qtcreatorcrashhandler/crashhandler.h index b46468451f1..31a50528e26 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.h +++ b/src/tools/qtcreatorcrashhandler/crashhandler.h @@ -43,7 +43,6 @@ public: void run(); -public slots: void onError(const QString &errorMessage); void onBacktraceChunk(const QString &chunk); void onBacktraceFinished(const QString &backtrace); diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp index ebde20d3e0c..a1361bde2f5 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp @@ -59,10 +59,13 @@ CrashHandlerDialog::CrashHandlerDialog(CrashHandler *handler, const QString &sig QIcon icon = style->standardIcon(QStyle::SP_MessageBoxCritical); m_ui->iconLabel->setPixmap(icon.pixmap(iconSize, iconSize)); - connect(m_ui->copyToClipBoardButton, SIGNAL(clicked()), this, SLOT(copyToClipboardClicked())); - connect(m_ui->reportBugButton, SIGNAL(clicked()), m_crashHandler, SLOT(openBugTracker())); - connect(m_ui->debugAppButton, SIGNAL(clicked()), m_crashHandler, SLOT(debugApplication())); - connect(m_ui->closeButton, SIGNAL(clicked()), this, SLOT(close())); + connect(m_ui->copyToClipBoardButton, &QAbstractButton::clicked, + this, &CrashHandlerDialog::copyToClipboardClicked); + connect(m_ui->reportBugButton, &QAbstractButton::clicked, + m_crashHandler, &CrashHandler::openBugTracker); + connect(m_ui->debugAppButton, &QAbstractButton::clicked, + m_crashHandler, &CrashHandler::debugApplication); + connect(m_ui->closeButton, &QAbstractButton::clicked, this, &CrashHandlerDialog::close); setApplicationInfo(signalName); } diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h index 3bcc2672c5d..c222e9c9b5f 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h @@ -52,11 +52,10 @@ public: void disableDebugAppButton(); bool runDebuggerWhileBacktraceNotFinished(); -private slots: +private: void copyToClipboardClicked(); void close(); -private: CrashHandler *m_crashHandler; Ui::CrashHandlerDialog *m_ui; };