1 files changed, 31 insertions, 39 deletions

diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 81c9da2f..f1f1b12b 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -17,49 +17,31 @@
 #include "Style.hpp"
 
 #include "App.hpp"
-#include "Port.hpp"
-
-#include "ganv/Port.hpp"
-#include "ingen/Log.hpp"
-#include "ingen/Parser.hpp"
-#include "ingen/client/PluginModel.hpp"
-#include "ingen/client/PortModel.hpp"
-
-#include <cassert>
-#include <cstdlib>
-#include <fstream>
-#include <map>
-#include <string>
 
-namespace ingen {
-namespace gui {
+#include <ingen/URIs.hpp>
+#include <ingen/client/PortModel.hpp>
+
+#include <string>
 
-using namespace ingen::client;
+namespace ingen::gui {
 
 Style::Style(App& app)
-	// Colours from the Tango palette with modified V
-	: _app(app)
+    : _app(app)
+{
 #ifdef INGEN_USE_LIGHT_THEME
-	, _audio_port_color(0xC8E6ABFF) // Green
-	, _control_port_color(0xAAC0E6FF) // Blue
-	, _cv_port_color(0xACE6E0FF) // Teal (between audio and control)
-	, _event_port_color(0xE6ABABFF) // Red
-	, _string_port_color(0xD8ABE6FF) // Plum
-#else
-	, _audio_port_color(0x4A8A0EFF) // Green
-	, _control_port_color(0x244678FF) // Blue
-	, _cv_port_color(0x248780FF) // Teal (between audio and control)
-	, _event_port_color(0x960909FF) // Red
-	, _string_port_color(0x5C3566FF) // Plum
+	_audio_port_color   = 0xC8E6ABFF;
+	_control_port_color = 0xAAC0E6FF;
+	_cv_port_color      = 0xACE6E0FF;
+	_event_port_color   = 0xE6ABABFF;
+	_string_port_color  = 0xD8ABE6FF;
 #endif
-{
 }
 
 /** Loads settings from the rc file.  Passing no parameter will load from
  * the default location.
  */
 void
-Style::load_settings(std::string filename)
+Style::load_settings(const std::string& filename)
 {
 	/* ... */
 }
@@ -68,7 +50,7 @@ Style::load_settings(std::string filename)
  * default location.
  */
 void
-Style::save_settings(std::string filename)
+Style::save_settings(const std::string& filename)
 {
 	/* ... */
 }
@@ -86,22 +68,32 @@ uint32_t
 Style::get_port_color(const client::PortModel* p)
 {
 	const URIs& uris = _app.uris();
+
 	if (p->is_a(uris.lv2_AudioPort)) {
 		return _audio_port_color;
-	} else if (p->is_a(uris.lv2_ControlPort)) {
+	}
+
+	if (p->is_a(uris.lv2_ControlPort)) {
 		return _control_port_color;
-	} else if (p->is_a(uris.lv2_CVPort)) {
+	}
+
+	if (p->is_a(uris.lv2_CVPort)) {
 		return _cv_port_color;
-	} else if (p->supports(uris.atom_String)) {
+	}
+
+	if (p->supports(uris.atom_String)) {
 		return _string_port_color;
-	} else if (_app.can_control(p)) {
+	}
+
+	if (_app.can_control(p)) {
 		return _control_port_color;
-	} else if (p->is_a(uris.atom_AtomPort)) {
+	}
+
+	if (p->is_a(uris.atom_AtomPort)) {
 		return _event_port_color;
 	}
 
 	return 0x555555FF;
 }
 
-} // namespace gui
-} // namespace ingen
+} // namespace ingen::gui