renamings.
This commit is contained in:
@@ -17,11 +17,11 @@
|
||||
#include <xqselectionmodel.h>
|
||||
#include <xqitemdelegate.h>
|
||||
#include <xqappdata.h>
|
||||
#include <xqtreeview.h>
|
||||
#include <xqtreetable.h>
|
||||
#include <xqitemfactory.h>
|
||||
|
||||
XQChildModel::XQChildModel( QObject *parent )
|
||||
: XQModel{parent}
|
||||
: XQViewModel{parent}
|
||||
{
|
||||
|
||||
}
|
||||
|
@@ -16,11 +16,11 @@
|
||||
#define XQCHILDMODEL_H
|
||||
|
||||
|
||||
#include <xqmodel.h>
|
||||
#include <xqviewmodel.h>
|
||||
|
||||
|
||||
|
||||
class XQChildModel : public XQModel
|
||||
class XQChildModel : public XQViewModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@@ -20,7 +20,7 @@
|
||||
|
||||
|
||||
|
||||
XQDocument::XQDocument(const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQModel* aModelView )
|
||||
XQDocument::XQDocument(const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQViewModel* aModelView )
|
||||
: fileName{ aFileName }, friendlyName{ aFriendlyName }, treeItem{ aTreeItem }, modelView{ aModelView }
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@ XQDocumentStore::~XQDocumentStore()
|
||||
|
||||
|
||||
|
||||
void XQDocumentStore::addDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQModel* aModelView )
|
||||
void XQDocumentStore::addDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQViewModel* aModelView )
|
||||
{
|
||||
XQDocument newDocument( aFileName, aFriendlyName, aTreeItem,aModelView );
|
||||
addAtKey( aFileName, newDocument );
|
||||
|
@@ -18,7 +18,7 @@
|
||||
#include <xqmaptor.h>
|
||||
#include <xqnode.h>
|
||||
|
||||
class XQModel;
|
||||
class XQViewModel;
|
||||
class XQItem;
|
||||
|
||||
// should this be internal??
|
||||
@@ -26,14 +26,14 @@ struct XQDocument
|
||||
{
|
||||
|
||||
XQDocument() = default;
|
||||
XQDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQModel* aModelView );
|
||||
XQDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQViewModel* aModelView );
|
||||
|
||||
virtual ~XQDocument();
|
||||
|
||||
QString fileName; // also used as key
|
||||
QString friendlyName;
|
||||
XQItem* treeItem{};
|
||||
XQModel* modelView{};
|
||||
XQViewModel* modelView{};
|
||||
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
XQDocumentStore() = default;
|
||||
virtual ~ XQDocumentStore();
|
||||
|
||||
void addDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQModel* aModelView );
|
||||
void addDocument( const QString& aFileName, const QString& aFriendlyName, XQItem* aTreeItem, XQViewModel* aModelView );
|
||||
|
||||
protected:
|
||||
|
||||
|
@@ -18,7 +18,7 @@
|
||||
#include <xqmainmodel.h>
|
||||
|
||||
#include <xqexception.h>
|
||||
#include <xqtreeview.h>
|
||||
#include <xqtreetable.h>
|
||||
#include <xqitemdelegate.h>
|
||||
#include <xqitem.h>
|
||||
#include <xqappdata.h>
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
|
||||
XQMainModel::XQMainModel(QObject *parent )
|
||||
: XQModel{parent}
|
||||
: XQViewModel{parent}
|
||||
{
|
||||
|
||||
}
|
||||
|
@@ -17,13 +17,13 @@
|
||||
|
||||
//#include <QItemSelectionModel>
|
||||
|
||||
#include <xqmodel.h>
|
||||
#include <xqviewmodel.h>
|
||||
//#include <xqmodelsections.h>
|
||||
|
||||
class XQTreeView;
|
||||
class XQTreeTable;
|
||||
|
||||
|
||||
class XQMainModel : public XQModel
|
||||
class XQMainModel : public XQViewModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
@@ -63,7 +63,7 @@ void XQMainWindow::initMainWindow()
|
||||
connect( _mainTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(onTreeItemClicked(QModelIndex)) );
|
||||
connect( _tabWidget, SIGNAL(tabBarClicked(int)), this, SLOT(onTabClicked(int)) );
|
||||
|
||||
connect( &_mainModelView, &XQModel::xqItemCreated, this, [=, this](XQItem* item)
|
||||
connect( &_mainModelView, &XQViewModel::xqItemCreated, this, [=, this](XQItem* item)
|
||||
{
|
||||
// when a new main tree item has been created ...
|
||||
QString pID = item->contentNode()->attribute(c_ProjectID);
|
||||
@@ -247,7 +247,7 @@ void XQMainWindow::loadDocument( const QString& fileName )
|
||||
QString pTitle = QString("Project %1: %2").arg( pID, fName );
|
||||
|
||||
// Eine neue TreeView erzeugn und im TabWidget parken.
|
||||
XQTreeView* childTreeView = new XQTreeView(_tabWidget);
|
||||
XQTreeTable* childTreeView = new XQTreeTable(_tabWidget);
|
||||
_tabWidget->addTab( childTreeView, pTitle );
|
||||
_tabWidget->setCurrentWidget( childTreeView );
|
||||
setWindowTitle( pTitle );
|
||||
|
@@ -101,7 +101,7 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="XQTreeView" name="_mainTreeView">
|
||||
<widget class="XQTreeTable" name="_mainTreeView">
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
@@ -280,9 +280,9 @@
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>XQTreeView</class>
|
||||
<class>XQTreeTable</class>
|
||||
<extends>QTreeView</extends>
|
||||
<header location="global">xqtreeview.h</header>
|
||||
<header location="global">xqtreetable.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
Reference in New Issue
Block a user