Fix half of util.h being in the global namespace

lift(), merge(), HomeserverData and QString aliases should have been
inside Quotient:: but the namespace was closed to define
operator<<(QDebug, ...) and not reopened again after that.

Author: KitsuneRal

Quotient/util.cpp

@@ -128,7 +128,7 @@ int Quotient::minorVersion()
 
 int Quotient::patchVersion() { return Quotient_VERSION_PATCH; }
 
-bool HomeserverData::checkMatrixSpecVersion(QStringView targetVersion) const
+bool Quotient::HomeserverData::checkMatrixSpecVersion(QStringView targetVersion) const
 {
     // TODO: Replace this naïve implementation with something smarter that can check things like
     //   1.12 > 1.11 and maybe even 1.10 > 1.9

Quotient/util.h

@@ -369,6 +369,7 @@ inline QDebug operator<<(QDebug dbg, QElapsedTimer et)
     return dbg;
 }
 
+namespace Quotient {
 //! \brief Lift an operation into dereferenceable types (std::optional or pointers)
 //!
 //! This is a more generic version of std::optional::and_then() that accepts an arbitrary number of
@@ -434,3 +435,4 @@ struct QUOTIENT_API HomeserverData {
 
     bool checkMatrixSpecVersion(QStringView targetVersion) const;
 };
+} // namespace Quotient