diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/src/fxbarcode/BC_DecoderResult.h | |
parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'xfa/src/fxbarcode/BC_DecoderResult.h')
-rw-r--r-- | xfa/src/fxbarcode/BC_DecoderResult.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h index ff98b2c407..9655d66383 100644 --- a/xfa/src/fxbarcode/BC_DecoderResult.h +++ b/xfa/src/fxbarcode/BC_DecoderResult.h @@ -7,7 +7,7 @@ #ifndef _BC_DECODERRESULT_H_
#define _BC_DECODERRESULT_H_
class CBC_DecoderResult;
-class CBC_DecoderResult : public CFX_Object
+class CBC_DecoderResult
{
public:
CBC_DecoderResult(CFX_ByteArray* rawBytes, CFX_ByteString text, CFX_ByteString ecLevel);
@@ -19,14 +19,14 @@ public: void setErrorsCorrected(FX_INT32 errorsCorrected);
FX_INT32 getErasures();
void setErasures(FX_INT32 erasures);
- CFX_Object* getOther();
- void setOther(CFX_Object* other);
+ void* getOther();
+ void setOther(void* other);
private:
CFX_ByteArray* m_rawBytes;
CFX_ByteString m_text;
CFX_ByteString m_ecLevel;
FX_INT32 m_errorsCorrected;
FX_INT32 m_erasures;
- CFX_Object* m_other;
+ void* m_other;
};
#endif
|