Skip to content

Commit 9ddd7f3

Browse files
committed
Remove most of the splitted implementation files
Only keep the Json_t files for the individual LCF classes. Everything else doesn't seem to be worth it RAM and compile time wise. Compiler appears to be smart enough to cache the templates. Also found a better way to get the raw JSON string removing the need for JsonViewT.
1 parent 63ca307 commit 9ddd7f3

19 files changed

Lines changed: 92 additions & 300 deletions

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,14 +338,6 @@ set(EDITOR_QML_UI
338338
)
339339

340340
set(EDITOR_QML_INTERFACE
341-
src/qmlbinding/json_internals/json_seek.h
342-
src/qmlbinding/json_internals/json_seek_impl.h
343-
src/qmlbinding/json_internals/json_seek_list_database.cpp
344-
src/qmlbinding/json_internals/json_seek_list_map.cpp
345-
src/qmlbinding/json_internals/json_seek_list_treemap.cpp
346-
src/qmlbinding/json_internals/json_seek_subtree_database.cpp
347-
src/qmlbinding/json_internals/json_seek_subtree_map.cpp
348-
src/qmlbinding/json_internals/json_seek_subtree_treemap.cpp
349341
src/qmlbinding/json_internals/json_t_database.cpp
350342
src/qmlbinding/json_internals/json_t_impl.h
351343
src/qmlbinding/json_internals/json_t_map.cpp

src/qmlbinding/json.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ class Json : public QObject {
7474
*/
7575
Q_INVOKABLE virtual QVariant list(QString jsonPtr) = 0;
7676

77-
/** @return Pointer to the underlying lcf::rpg data. For internal use only. */
78-
virtual void* rawData() = 0;
77+
/**
78+
* Dump the data given at the pointer location as raw JSON data.
79+
* Only use this as a last resort or for debugging purposes.
80+
*
81+
* @param jsonPtr JSON Pointer
82+
* @return JSON string
83+
*/
84+
Q_INVOKABLE virtual QString toJson(QString jsonPtr) const = 0;
7985
};

src/qmlbinding/json_internals/json_seek.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_impl.h

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_list_database.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_list_map.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_list_treemap.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_subtree_database.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_subtree_map.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/qmlbinding/json_internals/json_seek_subtree_treemap.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)