comparison rdf/RDFImporter.h @ 1752:6d09d68165a4 by-id

Further review of ById: make IDs only available when adding a model to the ById store, not by querying the item directly. This means any id encountered in the wild must have been added to the store at some point (even if later released), which simplifies reasoning about lifecycles

 #include <QString>
 
 #include <vector>
 
 #include "base/BaseTypes.h"
+#include "data/model/Model.h"
 
-class Model;
 class RDFImporterImpl;
 class ProgressReporter;
 
 class RDFImporter : public QObject
 {

 
     bool isOK();
     QString getErrorString() const;
 
     /**
-     * Return a list of models imported from the RDF source.  The
-     * models were heap-allocated by this class and are not registered
-     * with any other owner; the caller takes ownership and must
-     * arrange for them to be deleted manually or managed by a smart
-     * pointer.
+     * Return a list of models imported from the RDF source. The
+     * models have been newly created and registered with ById; the
+     * caller must arrange to release them.
      */
-    //!!! todo: ModelId-ise
-    std::vector<Model *> getDataModels(ProgressReporter *reporter);
+    std::vector<ModelId> getDataModels(ProgressReporter *reporter);
 
     enum RDFDocumentType {
         AudioRefAndAnnotations,
         Annotations,
         AudioRef,