tycho: fix broken inheritance chain by submoduling rust-qt-binding-generator

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "rust-qt-binding-generator"]
+	path = rust-qt-binding-generator
+	url = https://git.greyserv.net/marrub/rust-qt-binding-generator

rust-qt-binding-generator

@@ -0,0 +1 @@
+Subproject commit 598336e657cb4bf5ef5070dfa35b999b7dfd341b

tycho/CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(
    SHARED
       $ENV{OUT_DIR}/bindings.cc
       $ENV{OUT_DIR}/bindings.h
+      cc/interface.h
       cc/main.cc
       cc/mapmodel.cc
       cc/mapprops.cc
@@ -51,6 +52,7 @@ target_include_directories(
    maraiah-tycho-hermes
    PUBLIC
       $ENV{OUT_DIR}
+      cc
 )
 
 target_link_libraries(

tycho/Cargo.toml

@@ -10,7 +10,7 @@ maraiah = {path = ".."}
 [build-dependencies]
 cmake                     = "0.1"
 maraiah                   = {path = ".."}
-rust_qt_binding_generator = "0.3"
+rust_qt_binding_generator = {path = "../rust-qt-binding-generator"}
 
 [[bin]]
 name = "tycho"

tycho/bindings.json

@@ -1,4 +1,5 @@
 {
+   "beforeHeader": "interface.h",
    "cppFile": "",
    "rust": {
       "dir": "",
@@ -6,16 +7,16 @@
       "implementationModule": "gui"
    },
    "objects": {
-      "AbstractMapModel": {
+      "IMapModel": {
          "type": "List",
+         "baseClass": "IProjectModel",
          "functions": {
             "open": {
                "return": "bool",
                "mut": true,
-               "arguments": [{
+               "arguments": [
-                  "name": "path",
+                  {"name": "path", "type": "QString"}
-                  "type": "QString"
+               ]
-               }]
             },
             "save": {
                "return": "bool",
@@ -24,22 +25,16 @@
             "saveAs": {
                "return": "bool",
                "mut": false,
-               "arguments": [{
+               "arguments": [
-                  "name": "path",
+                  {"name": "path", "type": "QString"}
-                  "type": "QString"
+               ]
-               }]
-            },
-            "isDirty": {
-               "return": "bool",
-               "mut": false
             },
             "propIcon": {
                "return": "QString",
                "mut": false,
-               "arguments": [{
+               "arguments": [
-                  "name": "index",
+                  {"name": "index", "type": "quint16"}
-                  "type": "quint16"
+               ]
-               }]
             },
             "deselect": {
                "return": "void",
@@ -48,19 +43,25 @@
             "select": {
                "return": "void",
                "mut": true,
-               "arguments": [{
+               "arguments": [
-                  "name": "index",
+                  {"name": "index", "type": "quint16"}
-                  "type": "quint16"
+               ]
-               }]
             }
          },
+         "properties": {
+            "dirty": {"type": "bool", "write": true}
+         },
+         "itemProperties": {
+            "propIndex": {"type": "quint64", "roles": [["display"]]}
+         }
+      },
+      "IMapView": {
+         "type": "Object",
+         "functions": {
+         },
          "properties": {
          },
          "itemProperties": {
-            "propIndex": {
-               "type": "quint64",
-               "roles": [["display"]]
-            }
          }
       }
    }

tycho/cc/interface.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+
+#include <QAbstractItemModel>
+
+class IProjectModel : public QAbstractItemModel
+{
+   Q_OBJECT
+   Q_PROPERTY(bool dirty READ dirty WRITE setDirty NOTIFY dirtyChanged)
+
+public:
+   using QAbstractItemModel::QAbstractItemModel;
+
+   virtual ~IProjectModel() {}
+
+   virtual bool dirty() const = 0;
+   virtual void setDirty(bool dirty) = 0;
+
+   virtual bool open(QString const &path) = 0;
+   virtual bool save() const = 0;
+   virtual bool saveAs(QString const &path) const = 0;
+
+public slots:
+   virtual void deselect() = 0;
+   virtual void select(QModelIndex const &index) = 0;
+
+signals:
+   void dirtyChanged(bool dirty);
+   void deselected();
+   void selected(std::uint16_t index);
+};
+
+class IProjectView
+{
+public:
+   virtual ~IProjectView() {}
+};
+
+// EOF

tycho/cc/mapmodel.cc

@@ -1,8 +1,7 @@
 #include "tycho.h"
 
 MapModel::MapModel(Project *parent) :
-   AbstractMapModel(static_cast<QWidget *>(parent)),
+   IMapModel(parent)
-   ProjectModel()
 {
    dbgPrintFunc();
 }
@@ -12,29 +11,9 @@ MapModel::~MapModel()
    dbgPrintFunc();
 }
 
-bool MapModel::isDirty() const
-{
-   return AbstractMapModel::isDirty();
-}
-
-bool MapModel::open(QString const &path)
-{
-   return AbstractMapModel::open(path);
-}
-
-bool MapModel::save() const
-{
-   return AbstractMapModel::save();
-}
-
-bool MapModel::saveAs(QString const &path) const
-{
-   return AbstractMapModel::saveAs(path);
-}
-
 void MapModel::deselect()
 {
-   AbstractMapModel::deselect();
+   IMapModel::deselect();
 
    emit deselected();
 }
@@ -43,7 +22,7 @@ void MapModel::select(QModelIndex const &index)
 {
    auto idx = index.internalId();
 
-   AbstractMapModel::select(idx);
+   IMapModel::select(idx);
 
    emit selected(idx);
 }
@@ -58,7 +37,7 @@ QVariant MapModel::data(const QModelIndex &index, int role) const
          return QVariant::fromValue(icon);
       }
       default:
-         return AbstractMapModel::data(index, role);
+         return IMapModel::data(index, role);
    }
 }
 

tycho/cc/mapprops.cc

@@ -2,7 +2,7 @@
 
 MapProps::MapProps(Project *parent) :
    QDialog(static_cast<QWidget *>(parent)),
-   mapModel(parent->getMapModel())
+   m_mapModel(parent->mapModel())
 {
    setupUi(this);
 

tycho/cc/mapview.cc

@@ -2,7 +2,7 @@
 
 MapView::MapView(Project *parent) :
    QWidget(static_cast<QWidget *>(parent)),
-   mapModel(parent->getMapModel())
+   m_mapModel(parent->mapModel())
 {
    setupUi(this);
 

tycho/cc/menu.cc

@@ -22,7 +22,7 @@ Menu::~Menu()
 
 void Menu::mapNew()
 {
-   QScopedPointer proj{new Project(ProjectType::Map)};
+   QScopedPointer proj{new Project(Project::Map)};
 
    addProject(proj.take());
 }
@@ -40,9 +40,9 @@ void Menu::mapOpen()
             "All files (*)"));
 
    if(!fname.isEmpty()) {
-      QScopedPointer proj{new Project(ProjectType::Map)};
+      QScopedPointer proj{new Project(Project::Map)};
 
-      if(proj->getModel()->open(fname)) {
+      if(proj->model()->open(fname)) {
          addProject(proj.take());
       }
    }
@@ -98,7 +98,7 @@ void Menu::openMapProperties()
 {
    auto proj = activeProject();
 
-   if(proj && proj->getType() == ProjectType::Map) {
+   if(proj && proj->type() == Project::Map) {
       MapProps props{proj};
       props.exec();
    }
@@ -106,14 +106,14 @@ void Menu::openMapProperties()
 
 void Menu::updateActions()
 {
-   std::optional<ProjectType> active;
+   std::optional<Project::Type> active;
 
    if(auto proj = activeProject()) {
-      active = proj->getType();
+      active = proj->type();
    }
 
    actionClose->setEnabled(!!active);
-   actionMapProps->setEnabled(active == ProjectType::Map);
+   actionMapProps->setEnabled(active == Project::Map);
 }
 
 void Menu::closeEvent(QCloseEvent *event)

tycho/cc/project.cc

@@ -1,26 +1,26 @@
 #include "tycho.h"
 
 static
-ProjectModel *makeModel(Project *proj)
+IProjectModel *makeModel(Project *proj)
 {
-   switch(proj->getType()) {
+   switch(proj->type()) {
-      case ProjectType::Map: return new MapModel(proj);
+      case Project::Map: return new MapModel(proj);
    }
 }
 
 static
-ProjectView *makeView(Project *proj)
+IProjectView *makeView(Project *proj)
 {
-   switch(proj->getType()) {
+   switch(proj->type()) {
-      case ProjectType::Map: return new MapView(proj);
+      case Project::Map: return new MapView(proj);
    }
 }
 
-Project::Project(ProjectType _type) :
+Project::Project(Type type) :
    QMdiSubWindow(),
-   type(_type),
+   m_type(type),
-   model(makeModel(this)),
+   m_model(makeModel(this)),
-   view(makeView(this))
+   m_view(makeView(this))
 {
    auto widget = new QWidget(this);
 
@@ -29,12 +29,12 @@ Project::Project(ProjectType _type) :
    setWidget(widget);
    setAttribute(Qt::WA_DeleteOnClose);
 
-   listView->setModel(dynamic_cast<QAbstractItemModel *>(model));
+   listView->setModel(m_model);
-   verticalLayout->insertWidget(0, dynamic_cast<QWidget *>(view));
+   verticalLayout->insertWidget(0, dynamic_cast<QWidget *>(m_view));
 
    connect(listView,
            SIGNAL(doubleClicked(QModelIndex const &)),
-           dynamic_cast<QObject *>(model),
+           m_model,
            SLOT(select(QModelIndex const &)));
 
    dbgPrintFunc();
@@ -45,24 +45,24 @@ Project::~Project()
    dbgPrintFunc();
 }
 
-ProjectType Project::getType() const
+Project::Type Project::type() const
 {
-   return type;
+   return m_type;
 }
 
-ProjectModel *Project::getModel() const
+IProjectModel *Project::model() const
 {
-   return model;
+   return m_model;
 }
 
-MapModel *Project::getMapModel() const
+MapModel *Project::mapModel() const
 {
-   return dynamic_cast<MapModel *>(model);
+   return dynamic_cast<MapModel *>(m_model);
 }
 
 void Project::closeEvent(QCloseEvent *event)
 {
-   if(model->isDirty()) {
+   if(m_model->dirty()) {
       QMessageBox msg;
       msg.setText(tr("Do you want to save your changes to this project before closing it?"));
       msg.setInformativeText(tr("Unsaved changes will be lost unless you save."));
@@ -73,7 +73,7 @@ void Project::closeEvent(QCloseEvent *event)
 
       switch(msg.exec()) {
          case QMessageBox::Save:
-            model->save();
+            m_model->save();
             break;
          case QMessageBox::Discard:
             break;

tycho/cc/tycho.h

@@ -16,8 +16,6 @@
 #include <QMdiSubWindow>
 #include <QMessageBox>
 
-#include "bindings.h"
-
 #include "../ui/ui_about.h"
 #include "../ui/ui_license.h"
 #include "../ui/ui_mapprops.h"
@@ -25,43 +23,15 @@
 #include "../ui/ui_menu.h"
 #include "../ui/ui_project.h"
 
-// Types ---------------------------------------------------------------------|
+#include "bindings.h"
+
+#pragma clang diagnostic warning "-Winconsistent-missing-override"
 
-class MapModel;
-class MapProps;
-class MapView;
-class Menu;
 class Project;
 
-enum class ProjectType
-{
-   Map,
-};
-
 using byte = std::uint8_t;
 
-// Interfaces ----------------------------------------------------------------|
+class MapModel final : public IMapModel
-
-class ProjectModel
-{
-public:
-   virtual ~ProjectModel() {}
-
-   virtual bool isDirty() const = 0;
-   virtual bool open(QString const &path) = 0;
-   virtual bool save() const = 0;
-   virtual bool saveAs(QString const &path) const = 0;
-};
-
-class ProjectView
-{
-public:
-   virtual ~ProjectView() {}
-};
-
-// Implementations -----------------------------------------------------------|
-
-class MapModel final : public AbstractMapModel, public ProjectModel
 {
    Q_OBJECT
 
@@ -69,25 +39,17 @@ public:
    explicit MapModel(Project *parent);
    ~MapModel() override;
 
-   bool isDirty() const override;
-   bool open(QString const &path) override;
-   bool save() const override;
-   bool saveAs(QString const &path) const override;
-
 public slots:
-   void deselect();
+   void deselect() override;
-   void select(QModelIndex const &index);
+   void select(QModelIndex const &index) override;
-
-signals:
-   void deselected();
-   void selected(std::uint16_t index);
 
 private:
-   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole)
+   QVariant data(const QModelIndex &index, int role) const override;
-      const override;
 };
 
-class MapView final : public QWidget, public ProjectView, private Ui::MapView
+class MapView final : public  QWidget,
+                      public  IProjectView,
+                      private Ui::MapView
 {
    Q_OBJECT
 
@@ -96,12 +58,11 @@ public:
    ~MapView();
 
 private:
-   MapModel *const mapModel;
+   MapModel *const m_mapModel;
 };
 
-// UI ------------------------------------------------------------------------|
+class MapProps final : public  QDialog,
-
+                       private Ui::MapProps
-class MapProps final : public QDialog, private Ui::MapProps
 {
    Q_OBJECT
 
@@ -112,10 +73,11 @@ public:
    void accept() override;
 
 private:
-   MapModel *const mapModel;
+   MapModel *const m_mapModel;
 };
 
-class Menu final : public QMainWindow, private Ui::Menu
+class Menu final : public  QMainWindow,
+                   private Ui::Menu
 {
    Q_OBJECT
 
@@ -142,31 +104,34 @@ private:
    void addProject(Project *proj);
 };
 
-class Project final : public QMdiSubWindow, private Ui::Project
+class Project final : public  QMdiSubWindow,
+                      private Ui::Project
 {
    Q_OBJECT
+   Q_PROPERTY(Type           type     READ type     CONSTANT)
+   Q_PROPERTY(IProjectModel *model    READ model    CONSTANT)
+   Q_PROPERTY(MapModel      *mapModel READ mapModel CONSTANT)
 
 public:
-   explicit Project(ProjectType type);
+   enum Type {Map};
+   Q_ENUM(Type)
+
+   explicit Project(Type type);
    ~Project();
 
-   ProjectType getType() const;
+   Type type() const;
-
+   IProjectModel *model() const;
-   ProjectModel *getModel() const;
+   MapModel *mapModel() const;
-   MapModel     *getMapModel() const;
 
 protected:
    void closeEvent(QCloseEvent *event) override;
 
 private:
-   ProjectType const type;
+   Type           const m_type;
-
+   IProjectModel *const m_model;
-   ProjectModel *const model;
+   IProjectView  *const m_view;
-   ProjectView  *const view;
 };
 
-// Functions -----------------------------------------------------------------|
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wformat-security"
 

tycho/source/gui.rs

@@ -1,8 +1,10 @@
 //! GUI implementation.
 
-mod map;
+mod mapmodel;
+mod mapview;
 mod qobj;
 
-pub use self::map::AbstractMapModel;
+pub use self::mapmodel::IMapModel;
+pub use self::mapview::IMapView;
 
 // EOF

tycho/source/gui/mapmodel.rs

@@ -4,7 +4,7 @@ use super::qobj::*;
 use maraiah::{backtrace, err::*, map::{self, data::*}};
 use crate::cc;
 
-impl AbstractMapModel
+impl IMapModel
 {
    pub fn open_map(path: String) -> ResultS<EntryDataMap>
    {
@@ -29,20 +29,20 @@ impl AbstractMapModel
    */
 }
 
-impl AbstractMapModelTrait for AbstractMapModel
+impl IMapModelTrait for IMapModel
 {
-   /// Returns a new `AbstractMapModel` instance.
+   /// Returns a new `IMapModel` instance.
-   fn new(emit: AbstractMapModelEmitter, _: AbstractMapModelList) -> Self
+   fn new(emit: IMapModelEmitter, _: IMapModelList) -> Self
    {
       if cfg!(debug_assertions) {
-         eprintln!("new AbstractMapModel");
+         eprintln!("new IMapModel");
       }
 
-      Self{emit, map: EntryDataMap::default(), selected: None}
+      Self{emit, map: EntryDataMap::default(), selected: None, dirty: false}
    }
 
    /// Returns the emitter of `self`.
-   fn emit(&mut self) -> &mut AbstractMapModelEmitter {&mut self.emit}
+   fn emit(&mut self) -> &mut IMapModelEmitter {&mut self.emit}
 
    fn row_count(&self) -> usize {self.map.len()}
 
@@ -99,7 +99,9 @@ impl AbstractMapModelTrait for AbstractMapModel
    }
 
    /// Returns `true` if the file has been modified from its original state.
-   fn is_dirty(&self) -> bool {false}
+   fn dirty(&self) -> bool {self.dirty}
+
+   fn set_dirty(&mut self, dirty: bool) {self.dirty = dirty;}
 
    fn deselect(&mut self) {self.selected = None;}
 
@@ -113,20 +115,21 @@ impl AbstractMapModelTrait for AbstractMapModel
    }
 }
 
-impl Drop for AbstractMapModel
+impl Drop for IMapModel
 {
    fn drop(&mut self)
    {
       if cfg!(debug_assertions) {
-         eprintln!("drop AbstractMapModel");
+         eprintln!("drop IMapModel");
       }
    }
 }
 
-pub struct AbstractMapModel {
+pub struct IMapModel {
-   emit:     AbstractMapModelEmitter,
+   emit:     IMapModelEmitter,
    map:      EntryDataMap,
    selected: Option<u16>,
+   dirty:    bool,
 }
 
 // EOF

tycho/source/gui/mapview.rs

@@ -0,0 +1,35 @@
+//! Map view.
+
+use super::qobj::*;
+
+impl IMapViewTrait for IMapView
+{
+   /// Returns a new `IMapView` instance.
+   fn new(emit: IMapViewEmitter) -> Self
+   {
+      if cfg!(debug_assertions) {
+         eprintln!("new IMapView");
+      }
+
+      Self{emit}
+   }
+
+   /// Returns the emitter of `self`.
+   fn emit(&mut self) -> &mut IMapViewEmitter {&mut self.emit}
+}
+
+impl Drop for IMapView
+{
+   fn drop(&mut self)
+   {
+      if cfg!(debug_assertions) {
+         eprintln!("drop IMapView");
+      }
+   }
+}
+
+pub struct IMapView {
+   emit: IMapViewEmitter,
+}
+
+// EOF