浏览代码

Restore ctkDICOMModel as a QAbstractItemModel

Otherwise ctkDICOMModelTest2 fails because ctkDICOMModel::fetch() doesn't
create a QStandardItemModel.
Julien Finet 14 年之前
父节点
当前提交
324150ec79
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 1 1
      Libs/DICOM/Core/ctkDICOMModel.cpp
  2. 4 1
      Libs/DICOM/Core/ctkDICOMModel.h

+ 1 - 1
Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -377,7 +377,7 @@ void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 ctkDICOMModel::ctkDICOMModel(QObject* parentObject)
 ctkDICOMModel::ctkDICOMModel(QObject* parentObject)
-  : QStandardItemModel(parentObject)
+  : Superclass(parentObject)
   , d_ptr(new ctkDICOMModelPrivate(*this))
   , d_ptr(new ctkDICOMModelPrivate(*this))
 {
 {
   Q_D(ctkDICOMModel);
   Q_D(ctkDICOMModel);

+ 4 - 1
Libs/DICOM/Core/ctkDICOMModel.h

@@ -28,9 +28,12 @@
 #include "ctkDICOMCoreExport.h"
 #include "ctkDICOMCoreExport.h"
 
 
 class ctkDICOMModelPrivate;
 class ctkDICOMModelPrivate;
-class CTK_DICOM_CORE_EXPORT ctkDICOMModel : public QStandardItemModel
+class CTK_DICOM_CORE_EXPORT ctkDICOMModel
+//  : public QStandardItemModel
+  : public QAbstractItemModel
 {
 {
   Q_OBJECT
   Q_OBJECT
+  typedef QAbstractItemModel Superclass;
 public:
 public:
 
 
   enum {
   enum {