From ba3dbeb6d1dd5d71dae4ceac14d69d3ea2627ed7 Mon Sep 17 00:00:00 2001 From: Jonathan Young Date: Sat, 17 May 2014 17:16:04 +1000 Subject: [PATCH] Use method pointers instead of the error prone SIGNAL and SLOT macros. --- installwizard.cpp | 2 +- installwizard_patch.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installwizard.cpp b/installwizard.cpp index 349880e..fe0ae1e 100644 --- a/installwizard.cpp +++ b/installwizard.cpp @@ -45,7 +45,7 @@ InstallWizard::InstallWizard(QWidget *parent, Settings *settings) : setButtonLayout(layout); ui->setupUi(this); - connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel())); + connect(cancelButton, &QPushButton::clicked, this, &InstallWizard::cancel); setPage(Page_Setup, new InstallWizard_Setup(this, settings)); setPage(Page_Eula, new InstallWizard_Eula(this)); diff --git a/installwizard_patch.cpp b/installwizard_patch.cpp index 7f4db29..37991c8 100644 --- a/installwizard_patch.cpp +++ b/installwizard_patch.cpp @@ -79,9 +79,9 @@ void InstallWizard_Patch::initializePage() patchFile->open(); networkReply = nam.get(QNetworkRequest(QUrl("http://localhost:8080/linuxq3apoint-1.32b-3.x86.run"))); - connect(networkReply, SIGNAL(readyRead()), this, SLOT(downloadRead())); - connect(networkReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64))); - connect(networkReply, SIGNAL(finished()), this, SLOT(downloadFinished())); + connect(networkReply, &QNetworkReply::readyRead, this, &InstallWizard_Patch::downloadRead); + connect(networkReply, &QNetworkReply::downloadProgress, this, &InstallWizard_Patch::downloadProgress); + connect(networkReply, &QNetworkReply::finished, this, &InstallWizard_Patch::downloadFinished); } void InstallWizard_Patch::cleanupPage()