From 47334800c62dbf8fa32f4371a7416c59bae0bbb4 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 22 Oct 2021 23:14:23 +0900 Subject: [PATCH] common: code refactoring renamed internal module name IteratorModule -> IteratorAccessor --- docs/html/thorvg_8h_source.html | 4 ++-- inc/thorvg.h | 4 ++-- src/lib/meson.build | 2 +- src/lib/{tvgIteratorModule.h => tvgIteratorAccessor.h} | 10 +++++----- src/lib/tvgSaveModule.h | 4 ++-- src/wasm/thorvgwasm.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename src/lib/{tvgIteratorModule.h => tvgIteratorAccessor.h} (88%) diff --git a/docs/html/thorvg_8h_source.html b/docs/html/thorvg_8h_source.html index 3dfa8d72..fada9a25 100644 --- a/docs/html/thorvg_8h_source.html +++ b/docs/html/thorvg_8h_source.html @@ -112,7 +112,7 @@ $(function() {
50  friend Canvas; \
51  friend Scene; \
52  friend Picture; \
-
53  friend IteratorModule; \
+
53  friend IteratorAccessor; \
54 
55 
56 #define _TVG_DECALRE_IDENTIFIER() \
@@ -124,7 +124,7 @@ $(function() {
62 {
63 
64 class RenderMethod;
-
65 class IteratorModule;
+
65 class IteratorAccessor;
66 class Scene;
67 class Picture;
68 class Canvas;
diff --git a/inc/thorvg.h b/inc/thorvg.h index c899f1bd..7496ca90 100644 --- a/inc/thorvg.h +++ b/inc/thorvg.h @@ -50,7 +50,7 @@ protected: \ friend Canvas; \ friend Scene; \ friend Picture; \ - friend IteratorModule + friend IteratorAccessor #define _TVG_DECALRE_IDENTIFIER() \ @@ -61,7 +61,7 @@ namespace tvg { class RenderMethod; -class IteratorModule; +class IteratorAccessor; class Scene; class Picture; class Canvas; diff --git a/src/lib/meson.build b/src/lib/meson.build index a6d4cff2..280656c5 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -19,7 +19,7 @@ source_file = [ 'tvgLzw.h', 'tvgPictureImpl.h', 'tvgRender.h', - 'tvgIteratorModule.h', + 'tvgIteratorAccessor.h', 'tvgSaveModule.h', 'tvgSceneImpl.h', 'tvgShapeImpl.h', diff --git a/src/lib/tvgIteratorModule.h b/src/lib/tvgIteratorAccessor.h similarity index 88% rename from src/lib/tvgIteratorModule.h rename to src/lib/tvgIteratorAccessor.h index c54063ea..10b55a53 100644 --- a/src/lib/tvgIteratorModule.h +++ b/src/lib/tvgIteratorAccessor.h @@ -19,18 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef _TVG_ITERATOR_MODULE_H_ -#define _TVG_ITERATOR_MODULE_H_ +#ifndef _TVG_ITERATOR_ACCESSOR_H_ +#define _TVG_ITERATOR_ACCESSOR_H_ #include "tvgPaint.h" namespace tvg { -class IteratorModule +class IteratorAccessor { public: - //Utility Method: Iterator Delegator + //Utility Method: Iterator Accessor Iterator* iterator(const Paint* paint) { return paint->pImpl->iterator(); @@ -39,4 +39,4 @@ public: } -#endif //_TVG_ITERATOR_MODULE_H_ +#endif //_TVG_ITERATOR_ACCESSOR_H_ diff --git a/src/lib/tvgSaveModule.h b/src/lib/tvgSaveModule.h index 6a980bde..2a0f427f 100644 --- a/src/lib/tvgSaveModule.h +++ b/src/lib/tvgSaveModule.h @@ -22,12 +22,12 @@ #ifndef _TVG_SAVE_MODULE_H_ #define _TVG_SAVE_MODULE_H_ -#include "tvgIteratorModule.h" +#include "tvgIteratorAccessor.h" namespace tvg { -class SaveModule : public IteratorModule +class SaveModule : public IteratorAccessor { public: virtual ~SaveModule() {} diff --git a/src/wasm/thorvgwasm.cpp b/src/wasm/thorvgwasm.cpp index 4ec5cb5a..b4cb0263 100644 --- a/src/wasm/thorvgwasm.cpp +++ b/src/wasm/thorvgwasm.cpp @@ -21,7 +21,7 @@ */ #include -#include "tvgIteratorModule.h" +#include "tvgIteratorAccessor.h" #include @@ -29,7 +29,7 @@ using namespace emscripten; using namespace std; using namespace tvg; -class __attribute__((visibility("default"))) ThorvgWasm : public IteratorModule +class __attribute__((visibility("default"))) ThorvgWasm : public IteratorAccessor { public: static unique_ptr create()