'conflicts' modifications

[toast/confclerk.git] / src / mvc / delegate.h

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 42cce9429e5080f19868601b5f444ac458fbc3cf..3f544f7e10fc35b7b41e35cac1d7c4f32712d8be 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -43,7 +43,6 @@ class Delegate : public QItemDelegate
                 {
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }
-                bool hasConflict;
             private:
                 ControlId mId;
                 QImage *mImage;
@@ -71,7 +70,6 @@ class Delegate : public QItemDelegate
         // every time it requires them
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;
-        bool hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const;
 
     private:
         QPointer<QTreeView> mViewPtr;