From 93c7578f54519cf168b4a7f53d8b3851b098f644 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 12 Nov 2018 14:33:16 -0800
Subject: [PATCH] Convert hfm::Serializer to use hifi-namespaced types

---
 libraries/hfm/src/hfm/HFMSerializer.h   |  6 ++----
 libraries/shared/src/shared/HifiTypes.h | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 libraries/shared/src/shared/HifiTypes.h

diff --git a/libraries/hfm/src/hfm/HFMSerializer.h b/libraries/hfm/src/hfm/HFMSerializer.h
index 424b340a6c..db18f21e06 100644
--- a/libraries/hfm/src/hfm/HFMSerializer.h
+++ b/libraries/hfm/src/hfm/HFMSerializer.h
@@ -12,16 +12,14 @@
 #ifndef hifi_HFMSerializer_h
 #define hifi_HFMSerializer_h
 
-#include <QVarLengthArray>
-#include <QVariant>
-#include <QUrl>
+#include <shared/HifiTypes.h>
 
 #include "HFM.h"
 
 namespace hfm {
 
 class Serializer {
-    virtual Model::Pointer read(const QByteArray& data, const QVariantHash& mapping, const QUrl& url = QUrl()) = 0;
+    virtual Model::Pointer read(const hifi::ByteArray& data, const hifi::VariantHash& mapping, const hifi::URL& url = hifi::URL()) = 0;
 };
 
 };
diff --git a/libraries/shared/src/shared/HifiTypes.h b/libraries/shared/src/shared/HifiTypes.h
new file mode 100644
index 0000000000..500170c88b
--- /dev/null
+++ b/libraries/shared/src/shared/HifiTypes.h
@@ -0,0 +1,25 @@
+//
+//  HifiTypes.h
+//  libraries/shared/src/shared
+//
+//  Created by Sabrina Shanman on 2018/11/12.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_HifiTypes_h
+#define hifi_HifiTypes_h
+
+#include <QVarLengthArray>
+#include <QVariant>
+#include <QUrl>
+
+namespace hifi {
+    using ByteArray = QByteArray;
+    using VariantHash = QVariantHash;
+    using URL = QUrl;
+};
+
+#endif // hifi_HifiTypes_h