From 6e8c154c422a07c0a7591bed45ff17271af2f698 Mon Sep 17 00:00:00 2001
From: Zander Otavka <zotavka@gmail.com>
Date: Thu, 6 Aug 2015 18:54:08 -0700
Subject: [PATCH] Undo registering PropertyBinding as a meta type.

---
 interface/src/Application.cpp              |  1 -
 interface/src/ui/overlays/OverlayPanel.cpp | 50 ++++------------------
 interface/src/ui/overlays/OverlayPanel.h   |  1 -
 3 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c45f46fffc..503acc2ce3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3750,7 +3750,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
     qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
                             RayToOverlayIntersectionResultFromScriptValue);
-    qScriptRegisterMetaType(scriptEngine, propertyBindingToScriptValue, propertyBindingFromScriptValue);
 
     QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
     scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
diff --git a/interface/src/ui/overlays/OverlayPanel.cpp b/interface/src/ui/overlays/OverlayPanel.cpp
index ff7b218a5a..c1ef9fcdb4 100644
--- a/interface/src/ui/overlays/OverlayPanel.cpp
+++ b/interface/src/ui/overlays/OverlayPanel.cpp
@@ -40,8 +40,6 @@ QScriptValue propertyBindingToScriptValue(QScriptEngine* engine, const PropertyB
 }
 
 void propertyBindingFromScriptValue(const QScriptValue& object, PropertyBinding& value) {
-    value.avatar = "";
-    value.entity = {};
     QScriptValue avatar = object.property("avatar");
     QScriptValue entity = object.property("entity");
 
@@ -73,15 +71,6 @@ QScriptValue OverlayPanel::getProperty(const QString &property) {
         return propertyBindingToScriptValue(_scriptEngine, PropertyBinding(_positionBindMyAvatar ?
                                                                            "MyAvatar" : "",
                                                                            _positionBindEntity));
-//        QScriptValue obj = _scriptEngine->newObject();
-//
-//        if (_positionBindMyAvatar) {
-//            obj.setProperty("avatar", "MyAvatar");
-//        } else if (!_positionBindEntity.isNull()) {
-//            obj.setProperty("entity", _scriptEngine->newVariant(_positionBindEntity));
-//        }
-//        
-//        return obj;
     }
     if (property == "rotation") {
         return quatToScriptValue(_scriptEngine, getRotation());
@@ -90,15 +79,6 @@ QScriptValue OverlayPanel::getProperty(const QString &property) {
         return propertyBindingToScriptValue(_scriptEngine, PropertyBinding(_rotationBindMyAvatar ?
                                                                            "MyAvatar" : "",
                                                                            _rotationBindEntity));
-//        QScriptValue obj = _scriptEngine->newObject();
-//
-//        if (_rotationBindMyAvatar) {
-//            obj.setProperty("avatar", "MyAvatar");
-//        } else if (!_rotationBindEntity.isNull()) {
-//            obj.setProperty("entity", _scriptEngine->newVariant(_rotationBindEntity));
-//        }
-//
-//        return obj;
     }
     if (property == "visible") {
         return getVisible();
@@ -127,17 +107,10 @@ void OverlayPanel::setProperties(const QScriptValue &properties) {
 
     QScriptValue positionBinding = properties.property("positionBinding");
     if (positionBinding.isValid()) {
-        _positionBindMyAvatar = false;
-        _positionBindEntity = QUuid();
-
-        QScriptValue avatar = positionBinding.property("avatar");
-        QScriptValue entity = positionBinding.property("entity");
-
-        if (avatar.isValid()) {
-            _positionBindMyAvatar = (avatar.toVariant().toString() == "MyAvatar");
-        } else if (entity.isValid() && !entity.isNull()) {
-            _positionBindEntity = entity.toVariant().toUuid();
-        }
+        PropertyBinding binding = {};
+        propertyBindingFromScriptValue(positionBinding, binding);
+        _positionBindMyAvatar = binding.avatar == "MyAvatar";
+        _positionBindEntity = binding.entity;
     }
 
     QScriptValue rotation = properties.property("rotation");
@@ -151,17 +124,10 @@ void OverlayPanel::setProperties(const QScriptValue &properties) {
 
     QScriptValue rotationBinding = properties.property("rotationBinding");
     if (rotationBinding.isValid()) {
-        _rotationBindMyAvatar = false;
-        _rotationBindEntity = QUuid();
-
-        QScriptValue avatar = rotationBinding.property("avatar");
-        QScriptValue entity = positionBinding.property("entity");
-
-        if (avatar.isValid()) {
-            _rotationBindMyAvatar = (avatar.toVariant().toString() == "MyAvatar");
-        } else if (entity.isValid() && !entity.isNull()) {
-            _rotationBindEntity = entity.toVariant().toUuid();
-        }
+        PropertyBinding binding = {};
+        propertyBindingFromScriptValue(positionBinding, binding);
+        _rotationBindMyAvatar = binding.avatar == "MyAvatar";
+        _rotationBindEntity = binding.entity;
     }
 
     QScriptValue visible = properties.property("visible");
diff --git a/interface/src/ui/overlays/OverlayPanel.h b/interface/src/ui/overlays/OverlayPanel.h
index 9e790afd9f..f398abb4f8 100644
--- a/interface/src/ui/overlays/OverlayPanel.h
+++ b/interface/src/ui/overlays/OverlayPanel.h
@@ -29,7 +29,6 @@ public:
     QUuid entity;
 };
 
-Q_DECLARE_METATYPE(PropertyBinding);
 QScriptValue propertyBindingToScriptValue(QScriptEngine* engine, const PropertyBinding& value);
 void propertyBindingFromScriptValue(const QScriptValue& object, PropertyBinding& value);