comparison layer/SliceableLayer.h @ 1486:ac0a8addabcf

Merge from branch by-id

     // DenseThreeDimensionalModel.  This may be the layer's usual
     // model, or it may be a model derived from it (e.g. FFTModel in a
     // spectrogram that was constructed from a DenseTimeValueModel).
     // The SliceableLayer retains ownership of the model, and will
     // emit sliceableModelReplaced if it is about to become invalid.
-    virtual const Model *getSliceableModel() const = 0;
-
+    virtual ModelId getSliceableModel() const = 0;
+/*!!!
 signals:
     // Emitted when a model that was obtained through
     // getSliceableModel is about to be deleted.  If replacement is
     // non-NULL, it may be used instead.
     void sliceableModelReplaced(const Model *modelToBeReplaced,
                                 const Model *replacement);
+*/
 };
 
 #endif