renamings.

src/items/xqitem.cpp

@@ -13,7 +13,7 @@
 
 #include <xqitem.h>
 
-#include <xqmodel.h>
+#include <xqviewmodel.h>
 #include <xqmaptor.h>
 #include <QDateTime>
 #include <xqitemtype.h>
@@ -576,7 +576,7 @@ XQItem& XQItem::xqItemFromIndex(const QModelIndex& index)
 {
   if (index.isValid())
   {
-    const XQModel* mdl = dynamic_cast<const XQModel*>(index.model());
+    const XQViewModel* mdl = dynamic_cast<const XQViewModel*>(index.model());
     if (mdl)
       return mdl->xqItemFromIndex(index);
   }

src/items/xqitemdelegate.cpp

@@ -23,9 +23,9 @@
 #include <QCommonStyle>
 
 #include <xqitemdelegate.h>
-#include <xqtreeview.h>
+#include <xqtreetable.h>
 #include <xqitemtype.h>
-#include <xqmodel.h>
+#include <xqviewmodel.h>
 
 
 class XQItemEditorFactory : public QItemEditorFactory
@@ -61,7 +61,7 @@ public:
 
 
 
-XQItemDelegate::XQItemDelegate( XQModel& modelView)
+XQItemDelegate::XQItemDelegate( XQViewModel& modelView)
     : _modelView{modelView}
 {
   static  XQItemEditorFactory s_EditorFactory;
@@ -69,7 +69,7 @@ XQItemDelegate::XQItemDelegate( XQModel& modelView)
 }
 
 
-XQTreeView* XQItemDelegate::treeView() const
+XQTreeTable* XQItemDelegate::treeView() const
 {
   return _modelView.treeView();
 }

src/items/xqitemdelegate.h

@@ -19,8 +19,8 @@
 #include <xqappdata.h>
 
 class XQItem;
-class XQTreeView;
-class XQModel;
+class XQTreeTable;
+class XQViewModel;
 
 /**
  * @brief A specialized QItemDelegate class to draw different XQItem styles.
@@ -32,9 +32,9 @@ class XQItemDelegate : public QStyledItemDelegate
 
 public:
 
-  explicit XQItemDelegate(XQModel& modelView);
+  explicit XQItemDelegate(XQViewModel& modelView);
 
-  XQTreeView* treeView() const;
+  XQTreeTable* treeView() const;
   XQItem&     xqItemFromIndex( const QModelIndex& index ) const;
 
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
@@ -53,7 +53,7 @@ protected:
   void drawComboBoxStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
   void drawSpinBoxStyle(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
-  XQModel& _modelView;
+  XQViewModel& _modelView;
 
 };
 

src/items/xqitemfactory.cpp

@@ -15,7 +15,7 @@
 #include <xqitemfactory.h>
 #include <xqexception.h>
 #include <xqdocumentstore.h>
-#include <xqmodel.h>
+#include <xqviewmodel.h>
 #include <xqitemtype.h>
 
 #include <znode_factory.h>

src/items/xqitemfactory.h

@@ -19,7 +19,7 @@
 #include <xqitemtype.h>
 #include <functional>
 
-class XQModel;
+class XQViewModel;
 
 // erzeugt items aus XQNodes