aboutsummaryrefslogtreecommitdiff
path: root/src/QR-Code-scanner/QrCodeScanner.cpp
diff options
context:
space:
mode:
authorAlexander Blair <snipa@jagtech.io>2021-01-03 18:45:13 -0800
committerAlexander Blair <snipa@jagtech.io>2021-01-03 18:45:26 -0800
commitbbe371654258c25d034c07783e5ae776c2f60d90 (patch)
tree51e2161b29317061a4ae2f02cee4d70c9071a81c /src/QR-Code-scanner/QrCodeScanner.cpp
parent8e6a2cde0fd0e8c2a71456ea8bb36db49116d705 (diff)
parent8d4cda030e445d2b64cc327af125b538e014ecb0 (diff)
downloadmonzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.tar.gz
monzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.tar.xz
monzero-gui-bbe371654258c25d034c07783e5ae776c2f60d90.zip
Merge pull request #3277
8d4cda03 QR-Code-scanner: integrate QUIRC library, implement QrDecoder, drop ZBar (xiphon)
Diffstat (limited to 'src/QR-Code-scanner/QrCodeScanner.cpp')
-rw-r--r--src/QR-Code-scanner/QrCodeScanner.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/QR-Code-scanner/QrCodeScanner.cpp b/src/QR-Code-scanner/QrCodeScanner.cpp
index 55e396fe..2e8bde9f 100644
--- a/src/QR-Code-scanner/QrCodeScanner.cpp
+++ b/src/QR-Code-scanner/QrCodeScanner.cpp
@@ -27,7 +27,6 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "QrCodeScanner.h"
-#include <WalletManager.h>
#include <QVideoProbe>
#include <QCamera>
@@ -40,7 +39,7 @@ QrCodeScanner::QrCodeScanner(QObject *parent)
m_probe = new QVideoProbe(this);
m_thread = new QrScanThread(this);
m_thread->start();
- QObject::connect(m_thread, SIGNAL(decoded(int, QString)), this, SIGNAL(decoded(int, QString)));
+ QObject::connect(m_thread, SIGNAL(decoded(QString)), this, SIGNAL(decoded(QString)));
QObject::connect(m_thread, SIGNAL(notifyError(const QString &, bool)), this, SIGNAL(notifyError(const QString &, bool)));
connect(m_probe, SIGNAL(videoFrameProbed(QVideoFrame)), this, SLOT(processFrame(QVideoFrame)));
}