1 files changed, 32 insertions, 52 deletions
diff --git a/lib/util.cpp b/lib/util.cpp
index cf5e81a3..359b2959 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -1,20 +1,6 @@
-/******************************************************************************
- * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "util.h"
 
@@ -28,9 +14,6 @@
 
 static const auto RegExpOptions =
     QRegularExpression::CaseInsensitiveOption
-#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-    | QRegularExpression::OptimizeOnFirstUsageOption // Default since 5.12
-#endif
     | QRegularExpression::UseUnicodePropertiesOption;
 
 // Converts all that looks like a URL into HTML links
@@ -118,7 +101,7 @@ qreal Quotient::stringToHueF(const QString& s)
 }
 
 static const auto ServerPartRegEx = QStringLiteral(
-    "(\\[[^][:blank:]]+\\]|[-[:alnum:].]+)" // Either IPv6 address or hostname/IPv4 address
+    "(\\[[^][:space:]]+]|[-[:alnum:].]+)" // IPv6 address or hostname/IPv4 address
     "(?::(\\d{1,5}))?" // Optional port
 );
 
@@ -133,34 +116,31 @@ QString Quotient::serverPart(const QString& mxId)
     return parser.match(mxId).captured(1);
 }
 
-// Tests for function_traits<>
-
-using namespace Quotient;
-
-int f_();
-static_assert(std::is_same<fn_return_t<decltype(f_)>, int>::value,
-              "Test fn_return_t<>");
-
-void f1_(int, QString);
-static_assert(std::is_same<fn_arg_t<decltype(f1_), 1>, QString>::value,
-              "Test fn_arg_t<>");
-
-struct Fo {
-    int operator()();
-    static constexpr auto l = [] { return 0.0f; };
-};
-static_assert(std::is_same<fn_return_t<Fo>, int>::value,
-              "Test return type of function object");
-static_assert(std::is_same<fn_return_t<decltype(Fo::l)>, float>::value,
-              "Test return type of lambda");
-
-struct Fo1 {
-    void operator()(int);
-};
-static_assert(std::is_same<fn_arg_t<Fo1>, int>(),
-              "Test fn_arg_t defaulting to first argument");
-
-template <typename T>
-static QString ft(T&&);
-static_assert(std::is_same<fn_arg_t<decltype(ft<QString>)>, QString&&>(),
-              "Test function templates");
+QString Quotient::versionString()
+{
+    return QStringLiteral(Quotient_VERSION_STRING);
+}
+
+int Quotient::majorVersion()
+{
+    return Quotient_VERSION_MAJOR;
+}
+
+int Quotient::minorVersion()
+{
+    return Quotient_VERSION_MINOR;
+}
+
+int Quotient::patchVersion()
+{
+    return Quotient_VERSION_PATCH;
+}
+
+bool Quotient::encryptionSupported()
+{
+#ifdef Quotient_E2EE_ENABLED
+    return true;
+#else
+    return false;
+#endif
+}