1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 2e0fdb61..993fbb33 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -18,13 +18,14 @@
 
 #include "App.hpp"
 #include "Window.hpp"
+#include "ingen_config.h"
 
-#include "ingen/URIs.hpp"
-#include "lv2/urid/urid.h"
+#include <ingen/URIs.hpp>
+#include <lv2/urid/urid.h>
 
 #include <gdkmm/color.h>
 #include <glibmm/propertyproxy.h>
-#include <glibmm/signalproxy.h>
+#include <glibmm/ustring.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/enums.h>
@@ -38,8 +39,8 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace gui {
+namespace ingen::gui {
+
 using std::string;
 
 MessagesWindow::MessagesWindow(BaseObjectType*                   cobject,
@@ -83,7 +84,7 @@ MessagesWindow::init_window(App& app)
 void
 MessagesWindow::post_error(const string& msg)
 {
-	Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
+	const Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
 	text_buf->insert_with_tag(text_buf->end(), msg, _error_tag);
 	text_buf->insert(text_buf->end(), "\n");
 
@@ -100,9 +101,9 @@ MessagesWindow::post_error(const string& msg)
 int
 MessagesWindow::log(LV2_URID type, const char* fmt, va_list args)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
+	const std::lock_guard<std::mutex> lock{_mutex};
 
-#ifdef HAVE_VASPRINTF
+#if USE_VASPRINTF
 	char*     buf = nullptr;
 	const int len = vasprintf(&buf, fmt, args);
 #else
@@ -124,7 +125,7 @@ MessagesWindow::flush()
 		std::string line;
 
 		{
-			std::lock_guard<std::mutex> lock(_mutex);
+			const std::lock_guard<std::mutex> lock{_mutex};
 			if (!_stream.rdbuf()->in_avail()) {
 				return;
 			}
@@ -132,7 +133,7 @@ MessagesWindow::flush()
 			std::getline(_stream, line, '\0');
 		}
 
-		Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
+		const Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
 
 		auto t = _tags.find(type);
 		if (t != _tags.end()) {
@@ -150,10 +151,9 @@ MessagesWindow::flush()
 void
 MessagesWindow::clear_clicked()
 {
-	Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
+	const Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
 	text_buf->erase(text_buf->begin(), text_buf->end());
 	_clear_button->set_sensitive(false);
 }
 
-} // namespace gui
-} // namespace ingen
+} // namespace ingen::gui