diff options
Diffstat (limited to 'Libraries/LibGUI/GJsonArrayModel.h')
| -rw-r--r-- | Libraries/LibGUI/GJsonArrayModel.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Libraries/LibGUI/GJsonArrayModel.h b/Libraries/LibGUI/GJsonArrayModel.h index 0be6b27514..f65074e478 100644 --- a/Libraries/LibGUI/GJsonArrayModel.h +++ b/Libraries/LibGUI/GJsonArrayModel.h @@ -30,10 +30,12 @@ #include <AK/JsonObject.h> #include <LibGUI/GModel.h> -class GJsonArrayModel final : public GModel { +namespace GUI { + +class JsonArrayModel final : public Model { public: struct FieldSpec { - FieldSpec(const String& a_column_name, TextAlignment a_text_alignment, Function<GVariant(const JsonObject&)>&& a_massage_for_display, Function<GVariant(const JsonObject&)>&& a_massage_for_sort = {}, Function<GVariant(const JsonObject&)>&& a_massage_for_custom = {}) + FieldSpec(const String& a_column_name, TextAlignment a_text_alignment, Function<Variant(const JsonObject&)>&& a_massage_for_display, Function<Variant(const JsonObject&)>&& a_massage_for_sort = {}, Function<Variant(const JsonObject&)>&& a_massage_for_custom = {}) : column_name(a_column_name) , text_alignment(a_text_alignment) , massage_for_display(move(a_massage_for_display)) @@ -52,30 +54,30 @@ public: String json_field_name; String column_name; TextAlignment text_alignment; - Function<GVariant(const JsonObject&)> massage_for_display; - Function<GVariant(const JsonObject&)> massage_for_sort; - Function<GVariant(const JsonObject&)> massage_for_custom; + Function<Variant(const JsonObject&)> massage_for_display; + Function<Variant(const JsonObject&)> massage_for_sort; + Function<Variant(const JsonObject&)> massage_for_custom; }; - static NonnullRefPtr<GJsonArrayModel> create(const String& json_path, Vector<FieldSpec>&& fields) + static NonnullRefPtr<JsonArrayModel> create(const String& json_path, Vector<FieldSpec>&& fields) { - return adopt(*new GJsonArrayModel(json_path, move(fields))); + return adopt(*new JsonArrayModel(json_path, move(fields))); } - virtual ~GJsonArrayModel() override {} + virtual ~JsonArrayModel() override {} - virtual int row_count(const GModelIndex& = GModelIndex()) const override { return m_array.size(); } - virtual int column_count(const GModelIndex& = GModelIndex()) const override { return m_fields.size(); } + virtual int row_count(const ModelIndex& = ModelIndex()) const override { return m_array.size(); } + virtual int column_count(const ModelIndex& = ModelIndex()) const override { return m_fields.size(); } virtual String column_name(int column) const override { return m_fields[column].column_name; } virtual ColumnMetadata column_metadata(int) const override; - virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; + virtual Variant data(const ModelIndex&, Role = Role::Display) const override; virtual void update() override; const String& json_path() const { return m_json_path; } void set_json_path(const String& json_path); private: - GJsonArrayModel(const String& json_path, Vector<FieldSpec>&& fields) + JsonArrayModel(const String& json_path, Vector<FieldSpec>&& fields) : m_json_path(json_path) , m_fields(move(fields)) { @@ -85,3 +87,5 @@ private: Vector<FieldSpec> m_fields; JsonArray m_array; }; + +} |