mirror of https://github.com/status-im/qzxing.git
remove references of Array class that has been deleted
This commit is contained in:
Nikolaos Ftylitakis
parent
ea5b87bb0f
commit
c5df09111f
|
|
@ -21,7 +21,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <string.h>
|
||||
#include "common/Types.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*/
|
||||
|
||||
#include <string>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Str.h>
|
||||
#include <zxing/common/Types.h>
|
||||
|
|
|
|||
|
|
@ -1,174 +0,0 @@
|
|||
// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
|
||||
#ifndef ZXING_ARRAY_H
|
||||
#define ZXING_ARRAY_H
|
||||
|
||||
/*
|
||||
* Array.h
|
||||
* zxing
|
||||
*
|
||||
* Copyright 2010 ZXing authors All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
#include <QSharedPointer>
|
||||
|
||||
//#include <QSharedPointer>
|
||||
|
||||
//namespace zxing {
|
||||
|
||||
//template<typename T> class Array {
|
||||
//protected:
|
||||
//public:
|
||||
// std::vector<T> values_;
|
||||
// Array() {}
|
||||
// Array(int n) :
|
||||
// Counted(), values_(n, T()) {
|
||||
// }
|
||||
// Array(T const* ts, int n) :
|
||||
// Counted(), values_(ts, ts+n) {
|
||||
// }
|
||||
// Array(T const* ts, T const* te) :
|
||||
// Counted(), values_(ts, te) {
|
||||
// }
|
||||
// Array(T v, int n) :
|
||||
// Counted(), values_(n, v) {
|
||||
// }
|
||||
// Array(std::vector<T> &v) :
|
||||
// Counted(), values_(v) {
|
||||
// }
|
||||
// Array(std::vector<T> &other) :
|
||||
// Counted(), values_(other.values_) {
|
||||
// }
|
||||
// Array(std::vector<T> *other) :
|
||||
// Counted(), values_(other->values_) {
|
||||
// }
|
||||
// virtual ~Array() {
|
||||
// }
|
||||
// std::vector<T>& operator=(const std::vector<T> &other) {
|
||||
// values_ = other.values_;
|
||||
// return *this;
|
||||
// }
|
||||
// std::vector<T>& operator=(const std::vector<T> &array) {
|
||||
// values_ = array;
|
||||
// return *this;
|
||||
// }
|
||||
// T const& operator[](int i) const {
|
||||
// return values_[i];
|
||||
// }
|
||||
// T& operator[](int i) {
|
||||
// return values_[i];
|
||||
// }
|
||||
// int size() const {
|
||||
// return int(values_.size());
|
||||
// }
|
||||
// bool empty() const {
|
||||
// return values_.size() == 0;
|
||||
// }
|
||||
// std::vector<T> const& values() const {
|
||||
// return values_;
|
||||
// }
|
||||
// std::vector<T>& values() {
|
||||
// return values_;
|
||||
// }
|
||||
// void push_back(T value) {
|
||||
// values_.push_back(value);
|
||||
// }
|
||||
//};
|
||||
|
||||
//template<typename T> class ArrayRef {
|
||||
//private:
|
||||
//public:
|
||||
// std::vector<T> *array_;
|
||||
// ArrayRef() :
|
||||
// array_(0) {
|
||||
// }
|
||||
// explicit ArrayRef(int n) :
|
||||
// array_(0) {
|
||||
// reset(new std::vector<T> (n));
|
||||
// }
|
||||
// ArrayRef(T *ts, int n) :
|
||||
// array_(0) {
|
||||
// reset(new std::vector<T> (ts, n));
|
||||
// }
|
||||
// ArrayRef(std::vector<T> *a) :
|
||||
// array_(0) {
|
||||
// reset(a);
|
||||
// }
|
||||
// ArrayRef(const ArrayRef &other) :
|
||||
// Counted(), array_(0) {
|
||||
// reset(other.array_);
|
||||
// }
|
||||
|
||||
// template<class Y>
|
||||
// ArrayRef(const QSharedPointer<std::vector<Y> &other) :
|
||||
// array_(0) {
|
||||
// reset(static_cast<const std::vector<T> *>(other.array_));
|
||||
// }
|
||||
|
||||
// ~ArrayRef() {
|
||||
// if (array_) {
|
||||
// array_->release();
|
||||
// }
|
||||
// array_ = 0;
|
||||
// }
|
||||
|
||||
// T const& operator[](int i) const {
|
||||
// return (*array_)[i];
|
||||
// }
|
||||
|
||||
// T& operator[](int i) {
|
||||
// return (*array_)[i];
|
||||
// }
|
||||
|
||||
// void reset(std::vector<T> *a) {
|
||||
// if (a) {
|
||||
// a->retain();
|
||||
// }
|
||||
// if (array_) {
|
||||
// array_->release();
|
||||
// }
|
||||
// array_ = a;
|
||||
// }
|
||||
// void reset(const QSharedPointer<std::vector<T> &other) {
|
||||
// reset(other.array_);
|
||||
// }
|
||||
// QSharedPointer<std::vector<T>& operator=(const QSharedPointer<std::vector<T> &other) {
|
||||
// reset(other);
|
||||
// return *this;
|
||||
// }
|
||||
// QSharedPointer<std::vector<T>& operator=(std::vector<T> *a) {
|
||||
// reset(a);
|
||||
// return *this;
|
||||
// }
|
||||
|
||||
// std::vector<T>& operator*() const {
|
||||
// return *array_;
|
||||
// }
|
||||
|
||||
// std::vector<T>* operator->() const {
|
||||
// return array_;
|
||||
// }
|
||||
|
||||
// operator bool () const {
|
||||
// return array_ != 0;
|
||||
// }
|
||||
// bool operator ! () const {
|
||||
// return array_ == 0;
|
||||
// }
|
||||
//};
|
||||
|
||||
//} // namespace zxing
|
||||
|
||||
#endif // ZXING_ARRAY_H
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
*/
|
||||
|
||||
#include <zxing/common/BitArray.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <cstring>
|
||||
#include <sstream>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <zxing/ZXing.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/IllegalArgumentException.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <vector>
|
||||
#include <limits>
|
||||
#include <iostream>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/BitArray.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <limits>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/Types.h>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <string>
|
||||
#include <zxing/common/Str.h>
|
||||
#include <zxing/common/Types.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <zxing/ResultPoint.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <zxing/common/GlobalHistogramBinarizer.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
#include <zxing/common/Array.h>
|
||||
|
||||
using zxing::Binarizer;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <zxing/Binarizer.h>
|
||||
#include <zxing/common/BitArray.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <zxing/common/Array.h>
|
||||
|
||||
namespace zxing {
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#define GENERICGFPOLY_H
|
||||
|
||||
#include <vector>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <QSharedPointer>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <memory>
|
||||
#include <vector>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/reedsolomon/GenericGFPoly.h>
|
||||
#include <zxing/common/reedsolomon/GenericGF.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include <zxing/common/reedsolomon/GenericGFPoly.h>
|
||||
#include <zxing/common/reedsolomon/GenericGF.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/Types.h>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/datamatrix/Version.h>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <vector>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/datamatrix/Version.h>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/BitSource.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <zxing/common/reedsolomon/ReedSolomonDecoder.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <zxing/ZXing.h>
|
||||
#include <zxing/oned/CodaBarReader.h>
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
#include <zxing/FormatException.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <zxing/ZXing.h>
|
||||
#include <zxing/oned/Code128Reader.h>
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
#include <zxing/FormatException.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include "Code39Reader.h"
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
#include <zxing/ChecksumException.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include "Code93Reader.h"
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/FormatException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <zxing/ZXing.h>
|
||||
#include <zxing/oned/ITFReader.h>
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/FormatException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#include <zxing/oned/UPCEReader.h>
|
||||
#include <zxing/oned/UPCAReader.h>
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/NotFoundException.h>
|
||||
#include <math.h>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
*/
|
||||
|
||||
#include <zxing/oned/OneDResultPoint.h>
|
||||
#include <zxing/common/Array.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <zxing/FormatException.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <stdint.h>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
*/
|
||||
|
||||
#include <bigint/BigInteger.hh>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/Str.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <zxing/pdf417/decoder/ec/ErrorCorrection.h>
|
||||
#include <zxing/pdf417/decoder/ec/ModulusGF.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <zxing/pdf417/decoder/ec/ModulusGF.h>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
*/
|
||||
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <zxing/ReaderException.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/qrcode/Version.h>
|
||||
#include <zxing/qrcode/FormatInformation.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <vector>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/qrcode/Version.h>
|
||||
#include <zxing/qrcode/ErrorCorrectionLevel.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <zxing/common/Array.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include <zxing/qrcode/decoder/Mode.h>
|
||||
#include <zxing/common/BitSource.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/CharacterSetECI.h>
|
||||
#include <zxing/DecodeHints.h>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <zxing/common/reedsolomon/ReedSolomonDecoder.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/DecoderResult.h>
|
||||
#include <zxing/common/BitMatrix.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <zxing/qrcode/detector/FinderPattern.h>
|
||||
#include <QSharedPointer>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <vector>
|
||||
|
||||
namespace zxing {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define BLOCKPAIR_H
|
||||
|
||||
#include <vector>
|
||||
#include <zxing/common/Array.h>
|
||||
#include <zxing/common/Types.h>
|
||||
|
||||
using namespace std;
|
||||
|
|
|
|||
Loading…
Reference in New Issue