1 files changed, 24 insertions, 20 deletions

diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 306846ee..f4dfccd2 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -14,13 +14,19 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/client/PluginModel.hpp"
-
-#include "ingen/Atom.hpp"
-#include "ingen/client/PluginUI.hpp"
-#include "lv2/core/lv2.h"
-
-#include <boost/optional/optional.hpp>
+#include <ingen/client/PluginModel.hpp>
+
+#include <ingen/Atom.hpp>
+#include <ingen/Forge.hpp>
+#include <ingen/Properties.hpp>
+#include <ingen/Resource.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/URIs.hpp>
+#include <ingen/client/PluginUI.hpp>
+#include <lilv/lilv.h>
+#include <lv2/core/lv2.h>
+#include <raul/Symbol.hpp>
+#include <sigc++/signal.h>
 
 #include <cctype>
 #include <cstring>
@@ -30,8 +36,7 @@
 
 using std::string;
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 LilvWorld*         PluginModel::_lilv_world   = nullptr;
 const LilvPlugins* PluginModel::_lilv_plugins = nullptr;
@@ -104,43 +109,43 @@ PluginModel::get_property(const URI& key) const
 		size_t last_delim = last_uri_delim(str);
 		while (last_delim != string::npos &&
 		       !contains_alpha_after(str, last_delim)) {
-			str = str.substr(0, last_delim);
+			str.resize(last_delim);
 			last_delim = last_uri_delim(str);
 		}
 		str = str.substr(last_delim + 1);
 
-		std::string symbol = raul::Symbol::symbolify(str);
+		const std::string symbol = raul::Symbol::symbolify(str);
 		set_property(_uris.lv2_symbol, _uris.forge.alloc(symbol));
 		return get_property(key);
 	}
 
 	if (_lilv_plugin) {
-		boost::optional<const Atom&> ret;
-		LilvNode*  lv2_pred = lilv_new_uri(_lilv_world, key.c_str());
-		LilvNodes* values   = lilv_plugin_get_value(_lilv_plugin, lv2_pred);
+		const Atom* ret      = nullptr;
+		LilvNode*   lv2_pred = lilv_new_uri(_lilv_world, key.c_str());
+		LilvNodes*  values   = lilv_plugin_get_value(_lilv_plugin, lv2_pred);
 		lilv_node_free(lv2_pred);
 		LILV_FOREACH (nodes, i, values) {
 			const LilvNode* value = lilv_nodes_get(values, i);
 			if (lilv_node_is_uri(value)) {
-				ret = set_property(
+				ret = &set_property(
 					key, _uris.forge.make_urid(URI(lilv_node_as_uri(value))));
 				break;
 			}
 
 			if (lilv_node_is_string(value)) {
-				ret = set_property(
+				ret = &set_property(
 					key, _uris.forge.alloc(lilv_node_as_string(value)));
 				break;
 			}
 
 			if (lilv_node_is_float(value)) {
-				ret = set_property(
+				ret = &set_property(
 					key, _uris.forge.make(lilv_node_as_float(value)));
 				break;
 			}
 
 			if (lilv_node_is_int(value)) {
-				ret = set_property(
+				ret = &set_property(
 					key, _uris.forge.make(lilv_node_as_int(value)));
 				break;
 			}
@@ -361,5 +366,4 @@ PluginModel::set_lilv_world(LilvWorld* world)
 	_lilv_plugins = lilv_world_get_all_plugins(_lilv_world);
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client