#3484 bookmarks: fix GCC build failure

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -1,5 +1,12 @@
 # QOwnNotes Changelog
 
+## 26.3.7
+
+- Fixed an xUbuntu 20.04 / GCC build failure caused by duplicate `qstring_literal`
+  symbols in `WebSocketServerService::httpResponse` by replacing
+  `QStringLiteral` default arguments with overloads
+  (for [#3484](https://github.com/pbek/QOwnNotes/issues/3484))
+
 ## 26.3.6
 
 - Added a local [Homepage](https://github.com/gethomepage/homepage)-compatible

src/services/websocketserverservice.cpp

@@ -300,21 +300,32 @@ QPair<QString, QHash<QString, QString>> WebSocketServerService::parseHttpRequest
     return {method, queryParams};
 }
 
+QString WebSocketServerService::httpResponse(int statusCode, const QByteArray &body) {
+    return httpResponse(statusCode, body, QLatin1String("OK"));
+}
+
+QString WebSocketServerService::httpResponse(int statusCode, const QByteArray &body,
+                                             const QString &statusText) {
+    return httpResponse(statusCode, body, statusText,
+                        QLatin1String("application/json; charset=utf-8"));
+}
+
 QString WebSocketServerService::httpResponse(int statusCode, const QByteArray &body,
                                              const QString &statusText,
                                              const QString &contentType) {
-    return QStringLiteral(
-               "HTTP/1.1 %1 %2\r\n"
-               "Content-Type: %3\r\n"
-               "Content-Length: %4\r\n"
-               "Access-Control-Allow-Origin: *\r\n"
-               "Access-Control-Allow-Methods: GET, OPTIONS\r\n"
-               "Access-Control-Allow-Headers: Content-Type\r\n"
-               "Cache-Control: no-store\r\n"
-               "Connection: close\r\n"
-               "\r\n%5")
-        .arg(QString::number(statusCode), statusText, contentType, QString::number(body.size()),
-             QString::fromUtf8(body));
+    const QString responseTemplate = QString::fromLatin1(
+        "HTTP/1.1 %1 %2\r\n"
+        "Content-Type: %3\r\n"
+        "Content-Length: %4\r\n"
+        "Access-Control-Allow-Origin: *\r\n"
+        "Access-Control-Allow-Methods: GET, OPTIONS\r\n"
+        "Access-Control-Allow-Headers: Content-Type\r\n"
+        "Cache-Control: no-store\r\n"
+        "Connection: close\r\n"
+        "\r\n%5");
+
+    return responseTemplate.arg(QString::number(statusCode), statusText, contentType,
+                                QString::number(body.size()), QString::fromUtf8(body));
 }
 
 QVector<Bookmark> WebSocketServerService::getBookmarksForSuggestions() {

src/services/websocketserverservice.h

@@ -97,9 +97,12 @@ class WebSocketServerService : public QObject {
     static QPair<QString, QHash<QString, QString>> parseHttpRequestLineAndQuery(
         const QString &request);
 
-    static QString httpResponse(
-        int statusCode, const QByteArray &body, const QString &statusText = QStringLiteral("OK"),
-        const QString &contentType = QStringLiteral("application/json; charset=utf-8"));
+    static QString httpResponse(int statusCode, const QByteArray &body);
+
+    static QString httpResponse(int statusCode, const QByteArray &body, const QString &statusText);
+
+    static QString httpResponse(int statusCode, const QByteArray &body, const QString &statusText,
+                                const QString &contentType);
 
     void startSuggestionHttpServer();