From 113470bb2f4ff84e4e3cf686a8d9f6ce10ca9854 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 27 Oct 2018 20:23:05 +0200 Subject: [PATCH] Adapt for latest changes in MUtilities library. --- src/main.cpp | 2 +- src/version.h | 2 +- src/win_updater.cpp | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2d3c3f0..61749bb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -146,7 +146,7 @@ static int simple_x264_main(int &argc, char **argv) qDebug(" Number of CPU's : %d\n", cpuFeatures.count); //Initialize Qt - QScopedPointer application(MUtils::Startup::create_qt(argc, argv, QLatin1String("Simple x264 Launcher"))); + QScopedPointer application(MUtils::Startup::create_qt(argc, argv, QLatin1String("Simple x264 Launcher"), QLatin1String("LoRd_MuldeR"), QLatin1String("muldersoft.com"), false)); if(application.isNull()) { return EXIT_FAILURE; diff --git a/src/version.h b/src/version.h index 821b36b..a46717e 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 8 #define VER_X264_PATCH 9 -#define VER_X264_BUILD 1138 +#define VER_X264_BUILD 1140 #define VER_X264_PORTABLE_EDITION (0) diff --git a/src/win_updater.cpp b/src/win_updater.cpp index 5b23e17..0975060 100644 --- a/src/win_updater.cpp +++ b/src/win_updater.cpp @@ -52,8 +52,7 @@ static const char *const DIGEST_KEY = "~Dv/bW3/7t>6?RXVwkaZk-hmS0#O4JS/5YQAO>\\8 const UpdaterDialog::binary_t UpdaterDialog::BINARIES[] = { - { "wget.exe", "35d70bf8a1799956b5de3975ff99088a4444a2d17202059afb63949b297e2cc81e5e49e2b95df1c4e26b49ab7430399c293bf805a0b250d686c6f4dd994a0764", 1 }, - { "mcat.exe", "8328dbdc505e8816a5d17929678cdcbb573eca0ab107a7da66dca9a94044b404619e2fcc15f8d66950bf0c1fc3af94c31661035cbb5133a4ec721f4c4825a7c9", 1 }, + { "curl.exe", "35d70bf8a1799956b5de3975ff99088a4444a2d17202059afb63949b297e2cc81e5e49e2b95df1c4e26b49ab7430399c293bf805a0b250d686c6f4dd994a0764", 1 }, { "gpgv.exe", "21219d89c1b5e0755264adb2484035309f486be05a15cb1b33d326badfafa3c84879cf15fa0dcc3fef1f02d5f3e581842117ea348b37a89e25674f683fcea5e7", 1 }, { "gpgv.gpg", "1a2f528e551b9abfb064f08674fdd421d3abe403469ddfee2beafd007775a6c684212a6274dc2b41a0b20dd5c2200021c91320e737f7a90b2ac5a40a6221d93f", 0 }, { "wupd.exe", "018a8d0d848407fb0cb530b4540c6f025fd4c280885becd37f83feed8aeb3af6f8e8e0d45066a36549efac7e64706ac1ef09aaa5c75ab8d12c4a70f41518a894", 1 }, @@ -258,7 +257,7 @@ void UpdaterDialog::initUpdate(void) //Create and setup thread if(!m_thread) { - m_thread.reset(new MUtils::UpdateChecker(getBin(m_binaries, "wget.exe"), getBin(m_binaries, "mcat.exe"), getBin(m_binaries, "gpgv.exe"), getBin(m_binaries, "gpgv.gpg"), "Simple x264 Launcher", x264_version_build(), false)); + m_thread.reset(new MUtils::UpdateChecker(getBin(m_binaries, "curl.exe"), getBin(m_binaries, "gpgv.exe"), getBin(m_binaries, "gpgv.gpg"), "Simple x264 Launcher", x264_version_build(), false)); connect(m_thread.data(), SIGNAL(statusChanged(int)), this, SLOT(threadStatusChanged(int))); connect(m_thread.data(), SIGNAL(finished()), this, SLOT(threadFinished())); connect(m_thread.data(), SIGNAL(terminated()), this, SLOT(threadFinished()));