From bb1c49dfa484db080938cff6f8f70167c9026a1c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 24 Jul 2007 19:26:47 +0000 Subject: Consistently rename all C++ files .cpp/.hpp. Fix (some) inclusion guard names to not clash with other libs. git-svn-id: http://svn.drobilla.net/lad/ingen@613 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/serialisation/Loader.cpp | 8 ++--- src/libs/serialisation/Loader.h | 56 -------------------------------- src/libs/serialisation/Loader.hpp | 56 ++++++++++++++++++++++++++++++++ src/libs/serialisation/Makefile.am | 4 +-- src/libs/serialisation/serialisation.cpp | 4 +-- src/libs/serialisation/serialisation.h | 38 ---------------------- src/libs/serialisation/serialisation.hpp | 38 ++++++++++++++++++++++ 7 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 src/libs/serialisation/Loader.h create mode 100644 src/libs/serialisation/Loader.hpp delete mode 100644 src/libs/serialisation/serialisation.h create mode 100644 src/libs/serialisation/serialisation.hpp (limited to 'src/libs/serialisation') diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp index f4c84f25..c14c8a1f 100644 --- a/src/libs/serialisation/Loader.cpp +++ b/src/libs/serialisation/Loader.cpp @@ -18,10 +18,10 @@ #include #include #include -#include -#include -#include "interface/EngineInterface.h" -#include "Loader.h" +#include +#include +#include "interface/EngineInterface.hpp" +#include "Loader.hpp" using namespace std; using namespace Raul; diff --git a/src/libs/serialisation/Loader.h b/src/libs/serialisation/Loader.h deleted file mode 100644 index a02e5cdb..00000000 --- a/src/libs/serialisation/Loader.h +++ /dev/null @@ -1,56 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LOADER_H -#define LOADER_H - -#include -#include -#include -#include -#include -#include -#include - -namespace Raul { class Atom; namespace RDF { class World; } } -namespace Ingen { namespace Shared { class EngineInterface; } } - -namespace Ingen { -namespace Serialisation { - - -class Loader { -public: - virtual ~Loader() {} - - typedef std::map Metadata; - - virtual bool - load(SharedPtr engine, - Raul::RDF::World* world, - const Glib::ustring& uri, - boost::optional parent, - std::string patch_name, - Glib::ustring patch_uri = "", - Metadata data = Metadata()); -}; - - -} // namespace Serialisation -} // namespace Ingen - -#endif // LOADER_H diff --git a/src/libs/serialisation/Loader.hpp b/src/libs/serialisation/Loader.hpp new file mode 100644 index 00000000..b729e71d --- /dev/null +++ b/src/libs/serialisation/Loader.hpp @@ -0,0 +1,56 @@ +/* This file is part of Ingen. + * Copyright (C) 2007 Dave Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LOADER_H +#define LOADER_H + +#include +#include +#include +#include +#include +#include +#include + +namespace Raul { class Atom; namespace RDF { class World; } } +namespace Ingen { namespace Shared { class EngineInterface; } } + +namespace Ingen { +namespace Serialisation { + + +class Loader { +public: + virtual ~Loader() {} + + typedef std::map Metadata; + + virtual bool + load(SharedPtr engine, + Raul::RDF::World* world, + const Glib::ustring& uri, + boost::optional parent, + std::string patch_name, + Glib::ustring patch_uri = "", + Metadata data = Metadata()); +}; + + +} // namespace Serialisation +} // namespace Ingen + +#endif // LOADER_H diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am index 4dbacc5f..556ab653 100644 --- a/src/libs/serialisation/Makefile.am +++ b/src/libs/serialisation/Makefile.am @@ -9,8 +9,8 @@ libingen_serialisation_la_LDFLAGS = -no-undefined -module -avoid-version libingen_serialisation_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ libingen_serialisation_la_SOURCES = \ - serialisation.h \ + serialisation.hpp \ serialisation.cpp \ - Loader.h \ + Loader.hpp \ Loader.cpp diff --git a/src/libs/serialisation/serialisation.cpp b/src/libs/serialisation/serialisation.cpp index e0764fc1..969cf9f2 100644 --- a/src/libs/serialisation/serialisation.cpp +++ b/src/libs/serialisation/serialisation.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "serialisation.h" -#include "Loader.h" +#include "serialisation.hpp" +#include "Loader.hpp" namespace Ingen { namespace Serialisation { diff --git a/src/libs/serialisation/serialisation.h b/src/libs/serialisation/serialisation.h deleted file mode 100644 index f65b9c2e..00000000 --- a/src/libs/serialisation/serialisation.h +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SERIALISATION_H -#define INGEN_SERIALISATION_H - -namespace Ingen { -namespace Serialisation { - -class Loader; - - -extern "C" { - - extern Loader* new_loader(); - -} - - -} // namespace Serialisation -} // namespace Ingen - -#endif // INGEN_SERIALISATION_H - diff --git a/src/libs/serialisation/serialisation.hpp b/src/libs/serialisation/serialisation.hpp new file mode 100644 index 00000000..f65b9c2e --- /dev/null +++ b/src/libs/serialisation/serialisation.hpp @@ -0,0 +1,38 @@ +/* This file is part of Ingen. + * Copyright (C) 2007 Dave Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SERIALISATION_H +#define INGEN_SERIALISATION_H + +namespace Ingen { +namespace Serialisation { + +class Loader; + + +extern "C" { + + extern Loader* new_loader(); + +} + + +} // namespace Serialisation +} // namespace Ingen + +#endif // INGEN_SERIALISATION_H + -- cgit v1.2.1