compilation fixes for SailfishOS

Author: ftylitak

src/zxing/zxing/oned/rss/FinderPattern.cpp

@@ -18,7 +18,7 @@ FinderPattern::FinderPattern(const FinderPattern *other)
 {
     m_value = other != nullptr ? other->m_value : 0;
     m_startEnd = other != nullptr ? other->m_startEnd : std::vector<int> ();
-    m_resultPoints = other != nullptr ? other->m_resultPoints : nullptr;
+    m_resultPoints = other != nullptr ? other->m_resultPoints : QSharedPointer<std::vector<QSharedPointer<ResultPoint>>>();
 }
 
 int FinderPattern::getValue() const

src/zxing/zxing/oned/rss/RSS14Reader.cpp

@@ -120,7 +120,7 @@ QSharedPointer<Result> RSS14Reader::constructResult(Pair leftPair, Pair rightPai
 
     return QSharedPointer<Result>(new Result(
                            QSharedPointer<String>(new String(buffer)),
-                           nullptr,
+                           QSharedPointer<std::vector<zxing::byte>>(),
                            resultPoints,
                            BarcodeFormat::RSS_14));
 }

src/zxing/zxing/oned/rss/expanded/RSSExpandedReader.cpp

@@ -334,7 +334,7 @@ QSharedPointer<Result> RSSExpandedReader::constructResult(std::vector<ExpandedPa
 
     return QSharedPointer<Result>(new Result(
                            QSharedPointer<String>(new String(resultingString)),
-                           nullptr,
+                           QSharedPointer<std::vector<zxing::byte>>(),
                            resultPoints,
                            BarcodeFormat::RSS_EXPANDED
                            ));

src/zxing/zxing/oned/rss/expanded/decoders/DecodedNumeric.h

@@ -46,7 +46,7 @@ class DecodedNumeric : public DecodedObject
     static const int FNC1 = 10;
     DecodedNumeric(int newPosition, int firstDigit, int secondDigit);
 
-    DecodedNumeric(const QSharedPointer<DecodedNumeric> other = nullptr);
+    DecodedNumeric(const QSharedPointer<DecodedNumeric> other);
 
     int getFirstDigit() const;
 

src/zxing/zxing/qrcode/decoder/BitMatrixParser.h

@@ -32,7 +32,7 @@ namespace qrcode {
 class BitMatrixParser  {
 private:
   QSharedPointer<BitMatrix> bitMatrix_;
-  QSharedPointer<Version>parsedVersion_;
+  QSharedPointer<Version> parsedVersion_;
   QSharedPointer<FormatInformation> parsedFormatInfo_;
   bool mirror_;
 

src/zxing/zxing/qrcode/decoder/QRBitMatrixParser.cpp

@@ -190,8 +190,8 @@ void BitMatrixParser::remask() {
 }
 
 void BitMatrixParser::setMirror(boolean mirror) {
-    parsedVersion_ = 0;
-    parsedFormatInfo_ = 0;
+    parsedVersion_.reset();
+    parsedFormatInfo_.reset();
     mirror_ = mirror;
 }
 

src/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp

@@ -150,8 +150,7 @@ AlignmentPatternFinder::~AlignmentPatternFinder()
 {
   for (int i = 0; i < int(possibleCenters_->size()); i++)
   {
-    (*possibleCenters_)[i].clear();
-    (*possibleCenters_)[i] = 0;
+    (*possibleCenters_)[i].reset();
   }
   delete possibleCenters_;
 }