AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into open-config-in-app

Browse source
This commit is contained in:
pokamest 2022-07-31 23:39:11 +03:00
commit 9f7b2de311
22 changed files with 96 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/platforms/ios/QRCodeReader.cpp → client/platforms/ios/QRCodeReaderBase.cpp
View file

@ -1,4 +1,4 @@
#include "QRCodeReader.h"
#include "QRCodeReaderBase.h"
QRCodeReader::QRCodeReader()
{
@ -11,4 +11,4 @@ QRect QRCodeReader::cameraSize() {
void QRCodeReader::startReading() {}
void QRCodeReader::stopReading() {}
void QRCodeReader::setCameraSize(QRect) {};
void QRCodeReader::setCameraSize(QRect) {}

6
client/platforms/ios/QRCodeReader.h → client/platforms/ios/QRCodeReaderBase.h
View file

@ -1,5 +1,5 @@
#ifndef QRCODEREADER_H
#define QRCODEREADER_H
#ifndef QRCODEREADERBASE_H
#define QRCODEREADERBASE_H
#include <QObject>
#include <QRect>
@ -25,4 +25,4 @@ private:
QRect m_cameraSize;
};
#endif // QRCODEREADER_H
#endif // QRCODEREADERBASE_H

2
client/platforms/ios/QRCodeReader.mm → client/platforms/ios/QRCodeReaderBase.mm
View file

@ -1,4 +1,4 @@
#include "QRCodeReader.h"
#include "QRCodeReaderBase.h"
#import <UIKit/UIKit.h>
#import <AVFoundation/AVFoundation.h>