summaryrefslogtreecommitdiffstats
path: root/src/serialisation/Parser.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-16 19:27:56 +0000
committerDavid Robillard <d@drobilla.net>2011-02-16 19:27:56 +0000
commit4777248a1bb15e0833d688d8c8a7c81db0bf02ac (patch)
tree9fcaf607d32f452f79286d8402348feae0cbdd66 /src/serialisation/Parser.hpp
parent2c1079446f0b06559a683a9f4b0192a4f7637770 (diff)
downloadingen-4777248a1bb15e0833d688d8c8a7c81db0bf02ac.tar.gz
ingen-4777248a1bb15e0833d688d8c8a7c81db0bf02ac.tar.bz2
ingen-4777248a1bb15e0833d688d8c8a7c81db0bf02ac.zip
Tidy.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2962 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation/Parser.hpp')
-rw-r--r--src/serialisation/Parser.hpp121
1 files changed, 61 insertions, 60 deletions
diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp
index 06f42f14..103cd9a0 100644
--- a/src/serialisation/Parser.hpp
+++ b/src/serialisation/Parser.hpp
@@ -15,13 +15,16 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INGEN_SERIALISATION_LOADER_HPP
-#define INGEN_SERIALISATION_LOADER_HPP
+#ifndef INGEN_SERIALISATION_PARSER_HPP
+#define INGEN_SERIALISATION_PARSER_HPP
#include <string>
#include <list>
+
#include <glibmm/ustring.h>
+
#include <boost/optional.hpp>
+
#include "interface/GraphObject.hpp"
namespace Raul { class Path; }
@@ -34,7 +37,6 @@ namespace Shared { class World; }
namespace Serialisation {
-
class Parser {
public:
virtual ~Parser() {}
@@ -42,33 +44,33 @@ public:
typedef Shared::GraphObject::Properties Properties;
virtual bool parse_document(
- Ingen::Shared::World* world,
- Shared::CommonInterface* target,
- Glib::ustring document_uri,
- boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
- boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
- boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Shared::CommonInterface* target,
+ Glib::ustring document_uri,
+ boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
+ boost::optional<Properties> data=boost::optional<Properties>());
virtual bool parse_string(
- Ingen::Shared::World* world,
- Shared::CommonInterface* target,
- const Glib::ustring& str,
- const Glib::ustring& base_uri,
- boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
- boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
- boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Shared::CommonInterface* target,
+ const Glib::ustring& str,
+ const Glib::ustring& base_uri,
+ boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
+ boost::optional<Properties> data=boost::optional<Properties>());
virtual bool parse_update(
- Ingen::Shared::World* world,
- Shared::CommonInterface* target,
- const Glib::ustring& str,
- const Glib::ustring& base_uri,
- boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
- boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
- boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Shared::CommonInterface* target,
+ const Glib::ustring& str,
+ const Glib::ustring& base_uri,
+ boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
+ boost::optional<Properties> data=boost::optional<Properties>());
struct PatchRecord {
PatchRecord(const Raul::URI& u, const Glib::ustring& f) : uri(u), filename(f) {}
@@ -84,52 +86,51 @@ public:
private:
boost::optional<Raul::Path> parse(
- Ingen::Shared::World* world,
- Shared::CommonInterface* target,
- Sord::Model& model,
- Glib::ustring document_uri,
- boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
- boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
- boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Shared::CommonInterface* target,
+ Sord::Model& model,
+ Glib::ustring document_uri,
+ boost::optional<Raul::Path> data_path=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
+ boost::optional<Properties> data=boost::optional<Properties>());
boost::optional<Raul::Path> parse_patch(
- Ingen::Shared::World* world,
- Ingen::Shared::CommonInterface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
- boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Ingen::Shared::CommonInterface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ boost::optional<Raul::Path> parent=boost::optional<Raul::Path>(),
+ boost::optional<Raul::Symbol> symbol=boost::optional<Raul::Symbol>(),
+ boost::optional<Properties> data=boost::optional<Properties>());
boost::optional<Raul::Path> parse_node(
- Ingen::Shared::World* world,
- Ingen::Shared::CommonInterface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::Path& path,
- boost::optional<Properties> data=boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Ingen::Shared::CommonInterface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::Path& path,
+ boost::optional<Properties> data=boost::optional<Properties>());
bool parse_properties(
- Ingen::Shared::World* world,
- Ingen::Shared::CommonInterface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::URI& uri,
- boost::optional<Properties> data = boost::optional<Properties>());
+ Ingen::Shared::World* world,
+ Ingen::Shared::CommonInterface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::URI& uri,
+ boost::optional<Properties> data = boost::optional<Properties>());
bool parse_connections(
- Ingen::Shared::World* world,
- Ingen::Shared::CommonInterface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::Path& patch);
+ Ingen::Shared::World* world,
+ Ingen::Shared::CommonInterface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::Path& patch);
bool skip_property(const Sord::Node& predicate);
};
-
} // namespace Serialisation
} // namespace Ingen
-#endif // INGEN_SERIALISATION_LOADER_HPP
+#endif // INGEN_SERIALISATION_PARSER_HPP