X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fjson-parser-impl.h;h=58c2ce000a1639eeca9304c62ee462d396b7395b;hb=9a96ba99c22d8b726369fc0da8dbf62c9d51258b;hp=f635a827cbe9bbf855aa23bec9faabe2bba9619a;hpb=debd4ef5b35507bac4579dfbb8983b743872c70b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h index f635a82..58c2ce0 100644 --- a/dali-toolkit/internal/builder/json-parser-impl.h +++ b/dali-toolkit/internal/builder/json-parser-impl.h @@ -2,7 +2,7 @@ #define DALI_JSON_PARSER_IMPL_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ */ // EXTERNAL INCLUDES -#include -#include #include #include +#include +#include // INTERNAL INCLUDES #include @@ -32,13 +32,10 @@ namespace Dali { - namespace Toolkit { - namespace Internal { - /* * Parses JSON */ @@ -105,45 +102,42 @@ public: void Write(std::ostream& output, int indent) const; private: - typedef std::vector VectorChar; + typedef std::vector VectorChar; typedef VectorChar::iterator VectorCharIter; - typedef std::list SourceContainer; + typedef std::list SourceContainer; typedef std::list::iterator SourceContainerIter; - JsonParser(JsonParser &); + JsonParser(JsonParser&); JsonParser& operator=(const JsonParser&); - SourceContainer mSources; ///< List of strings from Parse() merge operations - - TreeNode* mRoot; ///< Tree root + SourceContainer mSources; ///< List of strings from Parse() merge operations - const char *mErrorDescription; ///< Last parse error description - int mErrorPosition; ///< Last parse error position - int mErrorLine; ///< Last parse error line - int mErrorColumn; ///< Last parse error column + TreeNode* mRoot; ///< Tree root - int mNumberOfChars; ///< The size of string data for all nodes - int mNumberOfNodes; ///< Node count + const char* mErrorDescription; ///< Last parse error description + int mErrorPosition; ///< Last parse error position + int mErrorLine; ///< Last parse error line + int mErrorColumn; ///< Last parse error column + int mNumberOfChars; ///< The size of string data for all nodes + int mNumberOfNodes; ///< Node count }; } // namespace Internal - inline const Internal::JsonParser& GetImplementation(const Toolkit::JsonParser& parser) { - DALI_ASSERT_ALWAYS( parser && "JsonParser handle is empty" ); + DALI_ASSERT_ALWAYS(parser && "JsonParser handle is empty"); const BaseObject& handle = parser.GetBaseObject(); return static_cast(handle); } - inline Internal::JsonParser& GetImplementation(Toolkit::JsonParser& parser) { - DALI_ASSERT_ALWAYS( parser && "JsonParser handle is empty" ); + DALI_ASSERT_ALWAYS(parser && "JsonParser handle is empty"); BaseObject& handle = parser.GetBaseObject(); @@ -154,5 +148,4 @@ inline Internal::JsonParser& GetImplementation(Toolkit::JsonParser& parser) } // namespace Dali - #endif // DALI_JSON_PARSER_IMPL_H