diff options
| -rw-r--r-- | src/libs/client/PluginModel.hpp | 6 | ||||
| -rw-r--r-- | src/libs/gui/App.hpp | 2 | ||||
| -rw-r--r-- | src/libs/gui/PatchPropertiesWindow.cpp | 6 | ||||
| -rw-r--r-- | src/libs/gui/UploadPatchWindow.cpp | 2 | ||||
| -rw-r--r-- | src/libs/serialisation/Serialiser.cpp | 7 | ||||
| -rw-r--r-- | src/progs/ingen/main.cpp | 2 |
6 files changed, 13 insertions, 12 deletions
diff --git a/src/libs/client/PluginModel.hpp b/src/libs/client/PluginModel.hpp index 95a68dbe..25dd2d9c 100644 --- a/src/libs/client/PluginModel.hpp +++ b/src/libs/client/PluginModel.hpp @@ -23,13 +23,14 @@ #include <iostream> #include <raul/Path.hpp> #include <raul/SharedPtr.hpp> -#include <raul/RDFWorld.hpp> +#include <redlandmm/World.hpp> #ifdef HAVE_SLV2 #include <slv2/slv2.h> #endif #include "interface/EngineInterface.hpp" #include "interface/Plugin.hpp" -using std::string; using std::cerr; using std::endl; + +using std::string; namespace Ingen { namespace Client { @@ -71,7 +72,6 @@ public: Type type_from_uri(const string& type_uri) { if (type_uri.substr(0, 6) != "ingen:") { - cerr << "INVALID TYPE STRING!" << endl; return Plugin::Internal; // ? } else { return type_from_string(type_uri.substr(6)); diff --git a/src/libs/gui/App.hpp b/src/libs/gui/App.hpp index 9e700ceb..261a9c72 100644 --- a/src/libs/gui/App.hpp +++ b/src/libs/gui/App.hpp @@ -26,8 +26,8 @@ #include <libgnomecanvasmm.h> #include <gtkmm.h> #include <libglademm.h> -#include <raul/RDFWorld.hpp> #include <raul/SharedPtr.hpp> +#include <redlandmm/World.hpp> using namespace std; diff --git a/src/libs/gui/PatchPropertiesWindow.cpp b/src/libs/gui/PatchPropertiesWindow.cpp index 2f0956e6..d8e98e34 100644 --- a/src/libs/gui/PatchPropertiesWindow.cpp +++ b/src/libs/gui/PatchPropertiesWindow.cpp @@ -16,12 +16,14 @@ */ #include <string> +#include <iostream> #include "client/PatchModel.hpp" #include "PatchPropertiesWindow.hpp" +using namespace std; + namespace Ingen { namespace GUI { -using std::string; PatchPropertiesWindow::PatchPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) @@ -76,7 +78,7 @@ PatchPropertiesWindow::cancel_clicked() void PatchPropertiesWindow::ok_clicked() { - cerr << "FIXME: properties\n"; + cerr << "FIXME: patch properties\n"; //m_patch_model->set_variable("author", Atom(_author_entry->get_text().c_str())); //m_patch_model->set_variable("description", Atom(_textview->get_buffer()->get_text().c_str())); diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp index d404cbcb..c69ce7f3 100644 --- a/src/libs/gui/UploadPatchWindow.cpp +++ b/src/libs/gui/UploadPatchWindow.cpp @@ -21,7 +21,7 @@ #include <dirent.h> #include <boost/optional/optional.hpp> #include <curl/curl.h> -#include <raul/RDFQuery.hpp> +#include <redlandmm/Query.hpp> #include "module/global.hpp" #include "module/World.hpp" #include "interface/EngineInterface.hpp" diff --git a/src/libs/serialisation/Serialiser.cpp b/src/libs/serialisation/Serialiser.cpp index b8195d34..c4a740a9 100644 --- a/src/libs/serialisation/Serialiser.cpp +++ b/src/libs/serialisation/Serialiser.cpp @@ -28,12 +28,11 @@ #include <utility> // pair, make_pair #include <vector> #include <raul/Atom.hpp> -#include <raul/AtomRedland.hpp> #include <raul/Path.hpp> -#include <raul/RDFModel.hpp> -#include <raul/RDFNode.hpp> -#include <raul/RDFWorld.hpp> #include <raul/TableImpl.hpp> +#include <redlandmm/Model.hpp> +#include <redlandmm/Node.hpp> +#include <redlandmm/World.hpp> #include "interface/EngineInterface.hpp" #include "interface/Plugin.hpp" #include "interface/Patch.hpp" diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index 4e4753c6..1c005539 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -26,7 +26,7 @@ #include <boost/optional.hpp> #include <glibmm/thread.h> #include <raul/Path.hpp> -#include <raul/RDFWorld.hpp> +#include <redlandmm/World.hpp> #include <raul/SharedPtr.hpp> #include "module/global.hpp" #include "module/Module.hpp" |