diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-06-04 07:26:56 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-06-04 07:26:56 +0900 |
| commit | fc0a6d894637517a3b88fc0534621d5fb6a4fbbc (patch) | |
| tree | 1f94067b7be47500bfcd46d845dc5eddc80ac3e8 | |
| parent | ddf10847d496dd65b00bc2026412958acd09790d (diff) | |
| download | libquotient-fc0a6d894637517a3b88fc0534621d5fb6a4fbbc.tar.gz libquotient-fc0a6d894637517a3b88fc0534621d5fb6a4fbbc.zip | |
converters.*: Fixes
Qualify functions properly; add converters.* to libqmatrixclient.pri
| -rw-r--r-- | lib/converters.cpp | 6 | ||||
| -rw-r--r-- | 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 |