From fc0a6d894637517a3b88fc0534621d5fb6a4fbbc Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 4 Jun 2018 07:26:56 +0900
Subject: converters.*: Fixes

Qualify functions properly; add converters.* to libqmatrixclient.pri
---
 lib/converters.cpp   | 6 +++---
 libqmatrixclient.pri | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/converters.cpp b/lib/converters.cpp
index f726db4c..f09fe5c2 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -22,18 +22,18 @@
 
 using namespace QMatrixClient;
 
-QJsonValue toJson(const QVariant& v)
+QJsonValue QMatrixClient::toJson(const QVariant& v)
 {
     return QJsonValue::fromVariant(v);
 }
 
-QJsonObject toJson(const QVariantMap& map)
+QJsonObject QMatrixClient::toJson(const QVariantMap& map)
 {
     return QJsonObject::fromVariantMap(map);
 }
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
-QJsonObject toJson(const QVariantHash& hMap)
+QJsonObject QMatrixClient::toJson(const QVariantHash& hMap)
 {
     return QJsonObject::fromVariantHash(hMap);
 }
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index 599d5b8f..7d81c1db 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -39,10 +39,10 @@ HEADERS += \
     $$files($$SRCPATH/csapi/*.h, false) \
     $$files($$SRCPATH/csapi/definitions/*.h, false) \
     $$SRCPATH/logging.h \
+    $$SRCPATH/converters.h \
     $$SRCPATH/settings.h \
     $$SRCPATH/networksettings.h \
-    $$SRCPATH/networkaccessmanager.h \
-    $$PWD/lib/variant_converters.h
+    $$SRCPATH/networkaccessmanager.h
 
 SOURCES += \
     $$SRCPATH/connectiondata.cpp \
@@ -68,6 +68,7 @@ SOURCES += \
     $$files($$SRCPATH/csapi/*.cpp, false) \
     $$files($$SRCPATH/csapi/definitions/*.cpp, false) \
     $$SRCPATH/logging.cpp \
+    $$SRCPATH/converters.cpp \
     $$SRCPATH/settings.cpp \
     $$SRCPATH/networksettings.cpp \
     $$SRCPATH/networkaccessmanager.cpp
-- 
cgit v1.2.3