From 702fd2e62c8f480d9e8bc0be28993811680fd9cb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 28 May 2016 23:52:16 +0300 Subject: [PATCH] CPaster: Use Qt5-style connect Change-Id: I22cbec892d1f0cd347929308f6aab40d9483fd88 Reviewed-by: Friedemann Kleint --- src/plugins/cpaster/frontend/main.cpp | 4 ++-- src/plugins/cpaster/protocol.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cpaster/frontend/main.cpp b/src/plugins/cpaster/frontend/main.cpp index 92ac228efe7..a5a9eea8063 100644 --- a/src/plugins/cpaster/frontend/main.cpp +++ b/src/plugins/cpaster/frontend/main.cpp @@ -72,7 +72,7 @@ public: qApp->exit(EXIT_FAILURE); return; } - connect(m_protocol.data(), SIGNAL(pasteDone(QString)), SLOT(handlePasteDone(QString))); + connect(m_protocol.data(), &Protocol::pasteDone, this, &PasteReceiver::handlePasteDone); m_protocol->paste(content); } @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; case ArgumentsCollector::RequestTypePaste: { PasteReceiver pr(argsCollector.protocol(), argsCollector.inputFilePath()); - QTimer::singleShot(0, &pr, SLOT(paste())); + QTimer::singleShot(0, &pr, &PasteReceiver::paste); return app.exec(); } } diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp index fabef8d52a8..62805451184 100644 --- a/src/plugins/cpaster/protocol.cpp +++ b/src/plugins/cpaster/protocol.cpp @@ -209,7 +209,7 @@ bool NetworkProtocol::httpStatus(QString url, QString *errorMessage, bool useHtt tr("Connecting to %1...").arg(url), QMessageBox::Cancel, Core::ICore::mainWindow()); - connect(reply.data(), SIGNAL(finished()), &box, SLOT(close())); + connect(reply.data(), &QNetworkReply::finished, &box, &QWidget::close); QApplication::setOverrideCursor(Qt::WaitCursor); box.exec(); QApplication::restoreOverrideCursor();