diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5b87fd470d..52c54c8b3d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -203,7 +203,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : setOrganizationName(applicationInfo.value("organizationName").toString()); setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); - qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str()); + qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion()); _settings = new QSettings(this); @@ -4426,6 +4426,7 @@ void Application::parseVersionXml() { QString releaseDate; QString releaseNotes; QString latestVersion; + QUrl downloadUrl; QXmlStreamReader xml(_latestVersionReply); while (!xml.atEnd() && !xml.hasError()) { @@ -4446,13 +4447,13 @@ void Application::parseVersionXml() { } if (xml.name() == operatingSystem) { xml.readNext(); - _downloadUrl = QUrl(xml.text().toString()); + downloadUrl = QUrl(xml.text().toString()); } } } if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) { - new UpdateDialog(_glWidget, releaseNotes, latestVersion, _downloadUrl); + new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadUrl); } delete _latestVersionReply; diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp index ae3a52932f..9bf86dd015 100644 --- a/interface/src/ui/UpdateDialog.cpp +++ b/interface/src/ui/UpdateDialog.cpp @@ -19,10 +19,11 @@ #include "SharedUtil.h" #include "UpdateDialog.h" -UpdateDialog::UpdateDialog(QWidget *parent, QString releaseNotes, QString latestVersion, QUrl downloadURL) : +UpdateDialog::UpdateDialog(QWidget *parent, const QString& releaseNotes, const QString& latestVersion, const QUrl& downloadURL) : QWidget(parent, Qt::Widget) { - _latestVersion = new QString(latestVersion); + _latestVersion = latestVersion; + _downloadUrl = downloadURL; QUiLoader updateDialogLoader; QWidget* updateDialog; @@ -46,22 +47,16 @@ UpdateDialog::UpdateDialog(QWidget *parent, QString releaseNotes, QString latest connect(downloadButton, SIGNAL(released()), this, SLOT(handleDownload())); connect(skipButton, SIGNAL(released()), this, SLOT(handleSkip())); - connect(closeButton, SIGNAL(released()), this, SLOT(handleClose())); + connect(closeButton, SIGNAL(released()), this, SLOT(close())); updateDialog->show(); } void UpdateDialog::handleDownload() { - Application* application = Application::getInstance(); - QDesktopServices::openUrl(application->_downloadUrl); - application->quit(); + QDesktopServices::openUrl(_downloadUrl); + Application::getInstance()->quit(); } void UpdateDialog::handleSkip() { - Application* application = Application::getInstance(); - application->skipVersion(*_latestVersion); - this->close(); -} - -void UpdateDialog::handleClose() { + Application::getInstance()->skipVersion(_latestVersion); this->close(); } \ No newline at end of file diff --git a/interface/src/ui/UpdateDialog.h b/interface/src/ui/UpdateDialog.h index aa0b800528..1c4f5de9d0 100644 --- a/interface/src/ui/UpdateDialog.h +++ b/interface/src/ui/UpdateDialog.h @@ -9,24 +9,21 @@ #ifndef __hifi__UpdateDialog__ #define __hifi__UpdateDialog__ -#include #include -#include - class UpdateDialog : public QWidget { Q_OBJECT public: - UpdateDialog(QWidget* parent, QString releaseNotes, QString latestVersion, QUrl downloadURL); + UpdateDialog(QWidget* parent, const QString& releaseNotes, const QString& latestVersion, const QUrl& downloadURL); private: - QString* _latestVersion; + QString _latestVersion; + QUrl _downloadUrl; private slots: void handleDownload(); void handleSkip(); - void handleClose(); }; #endif /* defined(__hifi__UpdateDialog__) */