From b3580d099d8012cfed26a9032b276b4bf8246a46 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 30 Nov 2020 14:54:26 +0100
Subject: Use raw string literals

---
 .clang-tidy             | 1 -
 src/Canvas.cpp          | 4 ++--
 src/JackLibDriver.cpp   | 2 +-
 src/event_to_string.cpp | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 173532f..be085a3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -32,7 +32,6 @@ Checks: >
   -hicpp-signed-bitwise,
   -llvm-header-guard,
   -llvmlibc-*,
-  -modernize-raw-string-literal,
   -modernize-use-trailing-return-type,
   -readability-convert-member-functions-to-static,
   -readability-implicit-bool-conversion,
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index 53cfc91..a7d677a 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -62,7 +62,7 @@ Canvas::create_port(Patchage& patchage, const PortID& id, const PortInfo& info)
 		const auto client_info = patchage.metadata().client(client_id);
 		if (!client_info.has_value()) {
 			patchage.log().error(fmt::format(
-			    "Unable to add port \"{}\", client \"{}\" is unknown",
+			    R"(Unable to add port "{}", client "{}" is unknown)",
 			    id,
 			    client_id));
 
@@ -93,7 +93,7 @@ Canvas::create_port(Patchage& patchage, const PortID& id, const PortInfo& info)
 	if (parent->get_port(id)) {
 		// TODO: Update existing port?
 		patchage.log().error(fmt::format(
-		    "Module \"{}\" already has port \"{}\"", client_name, port_name));
+		    R"(Module "{}" already has port "{}")", client_name, port_name));
 		return nullptr;
 	}
 
diff --git a/src/JackLibDriver.cpp b/src/JackLibDriver.cpp
index 36015fe..ba87fe1 100644
--- a/src/JackLibDriver.cpp
+++ b/src/JackLibDriver.cpp
@@ -230,7 +230,7 @@ JackLibDriver::get_port_info(const jack_port_t* const port)
 		}
 	} else {
 		_log.warning(fmt::format(
-		    "[JACK] Port \"{}\" has unknown type \"{}\"", name, type_str));
+		    R"([JACK] Port "{}" has unknown type "{}")", name, type_str));
 	}
 
 	// Get direction from port flags
diff --git a/src/event_to_string.cpp b/src/event_to_string.cpp
index 321ca4e..ef9d2c1 100644
--- a/src/event_to_string.cpp
+++ b/src/event_to_string.cpp
@@ -62,12 +62,12 @@ struct EventPrinter
 	std::string operator()(const ClientCreationEvent& event)
 	{
 		return fmt::format(
-		    "Add client \"{}\" (\"{}\")", event.id, event.info.label);
+		    R"(Add client "{}" ("{}"))", event.id, event.info.label);
 	}
 
 	std::string operator()(const ClientDestructionEvent& event)
 	{
-		return fmt::format("Remove client \"{}\"", event.id);
+		return fmt::format(R"(Add{} {} {} port "{}" ("{}"))", event.id);
 	}
 
 	std::string operator()(const PortType port_type)
@@ -131,7 +131,7 @@ struct EventPrinter
 	std::string operator()(const DisconnectionEvent& event)
 	{
 		return fmt::format(
-		    "Disconnect \"{}\" from \"{}\"", event.tail, event.head);
+		    R"(Disconnect "{}" from "{}")", event.tail, event.head);
 	}
 };
 
-- 
cgit v1.2.1