comparison layer/LayerFactory.h @ 125:999ae0f7d10c

* Change preferences dialog to ok/apply/cancel model
* Make preferences persist in a config file
* Change instance() to getInstance() for all singleton types
* Make pasting to time-value layer with no values in clipboard ask you how to
  generate the values
* Fix bad behaviour caused by importing "data"-type (i.e. 3d dense) model from
  annotation file without a fixed window size available

 
 	// Not-a-layer-type
 	UnknownLayer = 255
     };
 
-    static LayerFactory *instance();
+    static LayerFactory *getInstance();
     
     virtual ~LayerFactory();
 
     typedef std::set<LayerType> LayerTypeSet;
     LayerTypeSet getValidLayerTypes(Model *model);