Merge branch 'master' into kitsune-fix-read-receipts-and-markers

1 files changed, 5 insertions, 12 deletions

diff --git a/lib/util.h b/lib/util.h
index 78fc9ab7..c6171b91 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -219,18 +219,6 @@ template <typename FnT, int ArgN = 0>
 using fn_arg_t =
     std::tuple_element_t<ArgN, typename function_traits<FnT>::arg_types>;
 
-// TODO: get rid of it as soon as Apple Clang gets proper deduction guides
-//       for std::function<>
-//       ...or consider using QtPrivate magic used by QObject::connect()
-//       since wrap_in_function() is actually made for qt_connection_util.h
-//       ...for inspiration, also check a possible std::not_fn implementation at
-//       https://en.cppreference.com/w/cpp/utility/functional/not_fn
-template <typename FnT>
-inline auto wrap_in_function(FnT&& f)
-{
-    return typename function_traits<FnT>::function_type(std::forward<FnT>(f));
-}
-
 inline constexpr auto operator"" _ls(const char* s, std::size_t size)
 {
     return QLatin1String(s, int(size));
@@ -318,4 +306,9 @@ qreal stringToHueF(const QString& s);
 
 /** Extract the serverpart from MXID */
 QString serverPart(const QString& mxId);
+
+QString versionString();
+int majorVersion();
+int minorVersion();
+int patchVersion();
 } // namespace Quotient