diff rdf/PluginRDFDescription.h @ 440:5746c559af15

* Merge revisions 1131 to 1201 from sv-rdf-import branch

--- a/rdf/PluginRDFDescription.h	Thu Sep 18 12:09:32 2008 +0000
+++ b/rdf/PluginRDFDescription.h	Thu Sep 18 12:33:30 2008 +0000
@@ -28,14 +28,6 @@
     PluginRDFDescription(QString pluginId);
     ~PluginRDFDescription();
 
-    enum OutputType
-    {
-        OutputTypeUnknown,
-        OutputFeatures,
-        OutputEvents,
-        OutputFeaturesAndEvents
-    };
-
     enum OutputDisposition
     {
         OutputDispositionUnknown,
@@ -45,23 +37,22 @@
     };
 
     bool haveDescription() const;
-    OutputType getOutputType(QString outputId) const;
     OutputDisposition getOutputDisposition(QString outputId) const;
-    QString getOutputFeatureTypeURI(QString outputId) const;
     QString getOutputEventTypeURI(QString outputId) const;
+    QString getOutputFeatureAttributeURI(QString outputId) const;
+    QString getOutputSignalTypeURI(QString outputId) const;
     QString getOutputUnit(QString outputId) const;
 
 protected:    
-    typedef std::map<QString, OutputType> OutputTypeMap;
     typedef std::map<QString, OutputDisposition> OutputDispositionMap;
     typedef std::map<QString, QString> OutputStringMap;
 
     QString m_pluginId;
     bool m_haveDescription;
-    OutputTypeMap m_outputTypes;
     OutputDispositionMap m_outputDispositions;
-    OutputStringMap m_outputFeatureTypeURIMap;
     OutputStringMap m_outputEventTypeURIMap;
+    OutputStringMap m_outputFeatureAttributeURIMap;
+    OutputStringMap m_outputSignalTypeURIMap;
     OutputStringMap m_outputUnitMap;
     bool indexURL(QString url);
 };