From 58730c73d4e018785e93d2a397841d27739edc56 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Sun, 24 Jan 2016 12:18:40 -0500 Subject: [PATCH] Ammend 20addbbf These two signals were not QProcess::error(). --- src/frontends/qt4/GuiCompare.cpp | 4 ---- src/frontends/qt4/GuiProgress.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp index 9a4df587d2..83ffd5ace4 100644 --- a/src/frontends/qt4/GuiCompare.cpp +++ b/src/frontends/qt4/GuiCompare.cpp @@ -310,11 +310,7 @@ int GuiCompare::run() // init the compare object and start it compare_ = new Compare(new_buffer_, old_buffer_, dest_buffer_, options); -#if QT_VERSION >= 0x050600 - connect(compare_, SIGNAL(errorOccurred()), this, SLOT(error())); -#else connect(compare_, SIGNAL(error()), this, SLOT(error())); -#endif connect(compare_, SIGNAL(finished(bool)), this, SLOT(finished(bool))); connect(compare_, SIGNAL(progress(int)), this, SLOT(progress(int))); connect(compare_, SIGNAL(progressMax(int)), this, SLOT(progressMax(int))); diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp index e80f250e4a..a44438d489 100644 --- a/src/frontends/qt4/GuiProgress.cpp +++ b/src/frontends/qt4/GuiProgress.cpp @@ -56,11 +56,7 @@ GuiProgress::GuiProgress() SLOT(doWarning(QString const &, QString const &))); connect(this, SIGNAL(toggleWarning(QString const &, QString const &, QString const &)), SLOT(doToggleWarning(QString const &, QString const &, QString const &))); -#if QT_VERSION >= 0x050600 - connect(this, SIGNAL(errorOccurred(QString const &, QString const &, QString const &)), -#else connect(this, SIGNAL(error(QString const &, QString const &, QString const &)), -#endif SLOT(doError(QString const &, QString const &, QString const &))); connect(this, SIGNAL(information(QString const &, QString const &)), SLOT(doInformation(QString const &, QString const &))); -- 2.39.2