Use method pointers instead of the error prone SIGNAL and SLOT macros.

This commit is contained in:
Jonathan Young 2014-05-17 17:16:04 +10:00
parent 6341250996
commit ba3dbeb6d1
2 changed files with 4 additions and 4 deletions

View file

@ -45,7 +45,7 @@ InstallWizard::InstallWizard(QWidget *parent, Settings *settings) :
setButtonLayout(layout); setButtonLayout(layout);
ui->setupUi(this); 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_Setup, new InstallWizard_Setup(this, settings));
setPage(Page_Eula, new InstallWizard_Eula(this)); setPage(Page_Eula, new InstallWizard_Eula(this));

View file

@ -79,9 +79,9 @@ void InstallWizard_Patch::initializePage()
patchFile->open(); patchFile->open();
networkReply = nam.get(QNetworkRequest(QUrl("http://localhost:8080/linuxq3apoint-1.32b-3.x86.run"))); networkReply = nam.get(QNetworkRequest(QUrl("http://localhost:8080/linuxq3apoint-1.32b-3.x86.run")));
connect(networkReply, SIGNAL(readyRead()), this, SLOT(downloadRead())); connect(networkReply, &QNetworkReply::readyRead, this, &InstallWizard_Patch::downloadRead);
connect(networkReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64))); connect(networkReply, &QNetworkReply::downloadProgress, this, &InstallWizard_Patch::downloadProgress);
connect(networkReply, SIGNAL(finished()), this, SLOT(downloadFinished())); connect(networkReply, &QNetworkReply::finished, this, &InstallWizard_Patch::downloadFinished);
} }
void InstallWizard_Patch::cleanupPage() void InstallWizard_Patch::cleanupPage()