tycho: fix MapView sucking (and also remove RTTI)
parent
f9722647af
commit
262ab3712e
|
@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror")
|
|
||||||
|
if(NOT MSVC)
|
||||||
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
|
||||||
|
endif()
|
||||||
|
|
||||||
find_package(
|
find_package(
|
||||||
Qt5 5.6.0
|
Qt5 5.6.0
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
},
|
},
|
||||||
"IMapView": {
|
"IMapView": {
|
||||||
"type": "Object",
|
"type": "Object",
|
||||||
|
"baseClass": "IProjectView",
|
||||||
"functions": {
|
"functions": {
|
||||||
},
|
},
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
|
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
|
||||||
|
|
||||||
#include <QAbstractItemModel>
|
#include <QAbstractItemModel>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
class IProjectModel : public QAbstractItemModel
|
class IProjectModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
|
@ -31,10 +32,16 @@ signals:
|
||||||
void selected(std::uint16_t index);
|
void selected(std::uint16_t index);
|
||||||
};
|
};
|
||||||
|
|
||||||
class IProjectView
|
class IProjectView : public QObject
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
using QObject::QObject;
|
||||||
|
|
||||||
virtual ~IProjectView() {}
|
virtual ~IProjectView() {}
|
||||||
|
|
||||||
|
virtual QWidget *widget() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// EOF
|
// EOF
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
#include "tycho.h"
|
#include "tycho.h"
|
||||||
|
|
||||||
MapView::MapView(Project *parent) :
|
MapView::MapView(Project *parent) :
|
||||||
QWidget(parent),
|
IMapView(parent),
|
||||||
|
m_internal(parent),
|
||||||
m_mapModel(parent->mapModel())
|
m_mapModel(parent->mapModel())
|
||||||
{
|
{
|
||||||
setupUi(this);
|
setupUi(&m_internal);
|
||||||
|
|
||||||
dbgPrintFunc();
|
dbgPrintFunc();
|
||||||
}
|
}
|
||||||
|
@ -14,4 +15,9 @@ MapView::~MapView()
|
||||||
dbgPrintFunc();
|
dbgPrintFunc();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QWidget *MapView::widget()
|
||||||
|
{
|
||||||
|
return &m_internal;
|
||||||
|
}
|
||||||
|
|
||||||
// EOF
|
// EOF
|
||||||
|
|
|
@ -30,7 +30,7 @@ Project::Project(Type type) :
|
||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
|
||||||
listView->setModel(m_model);
|
listView->setModel(m_model);
|
||||||
verticalLayout->insertWidget(0, dynamic_cast<QWidget *>(m_view));
|
verticalLayout->insertWidget(0, m_view->widget());
|
||||||
|
|
||||||
connect(listView,
|
connect(listView,
|
||||||
SIGNAL(doubleClicked(QModelIndex const &)),
|
SIGNAL(doubleClicked(QModelIndex const &)),
|
||||||
|
|
|
@ -47,8 +47,7 @@ private:
|
||||||
QVariant data(const QModelIndex &index, int role) const override;
|
QVariant data(const QModelIndex &index, int role) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class MapView final : public QWidget,
|
class MapView final : public IMapView,
|
||||||
public IProjectView,
|
|
||||||
private Ui::MapView
|
private Ui::MapView
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -57,7 +56,10 @@ public:
|
||||||
explicit MapView(Project *parent);
|
explicit MapView(Project *parent);
|
||||||
~MapView();
|
~MapView();
|
||||||
|
|
||||||
|
QWidget *widget();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QWidget m_internal;
|
||||||
MapModel *const m_mapModel;
|
MapModel *const m_mapModel;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue