From d0409afc6a994a3e24043b8a96c83c022bcaa189 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Thu, 25 May 2017 15:53:57 -0700
Subject: Mass conversion of remaining class members (non-xfa)

Change-Id: I8365ba80e3395d59a3cf35dbd9d9162e86e712e3
Reviewed-on: https://pdfium-review.googlesource.com/5970
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
---
 fxbarcode/qrcode/BC_QRCoder.cpp | 4 ++--
 fxbarcode/qrcode/BC_QRCoder.h   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'fxbarcode/qrcode')

diff --git a/fxbarcode/qrcode/BC_QRCoder.cpp b/fxbarcode/qrcode/BC_QRCoder.cpp
index e3ac763499..b0a24fa27c 100644
--- a/fxbarcode/qrcode/BC_QRCoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -42,11 +42,11 @@ CBC_QRCoder::CBC_QRCoder()
 CBC_QRCoder::~CBC_QRCoder() {}
 
 CBC_QRCoderMode* CBC_QRCoder::GetMode() const {
-  return m_mode;
+  return m_mode.Get();
 }
 
 const CBC_QRCoderErrorCorrectionLevel* CBC_QRCoder::GetECLevel() const {
-  return m_ecLevel;
+  return m_ecLevel.Get();
 }
 
 int32_t CBC_QRCoder::GetVersion() const {
diff --git a/fxbarcode/qrcode/BC_QRCoder.h b/fxbarcode/qrcode/BC_QRCoder.h
index adeae6c521..fe34b5250b 100644
--- a/fxbarcode/qrcode/BC_QRCoder.h
+++ b/fxbarcode/qrcode/BC_QRCoder.h
@@ -9,6 +9,8 @@
 
 #include <memory>
 
+#include "core/fxcrt/cfx_unowned_ptr.h"
+
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderMode;
 class CBC_CommonByteMatrix;
@@ -48,8 +50,8 @@ class CBC_QRCoder {
   void SetMatrix(std::unique_ptr<CBC_CommonByteMatrix> pMatrix);
 
  private:
-  CBC_QRCoderMode* m_mode;
-  const CBC_QRCoderErrorCorrectionLevel* m_ecLevel;
+  CFX_UnownedPtr<CBC_QRCoderMode> m_mode;
+  CFX_UnownedPtr<const CBC_QRCoderErrorCorrectionLevel> m_ecLevel;
   int32_t m_version;
   int32_t m_matrixWidth;
   int32_t m_maskPattern;
-- 
cgit v1.2.3