From 1ddd856ca8ae741559f86782f66ca81fed318b5f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 15 Feb 2014 16:31:09 -0800 Subject: [PATCH] removed getProperties() which was not implemented --- interface/src/ui/ImageOverlay.cpp | 5 ----- interface/src/ui/ImageOverlay.h | 1 - interface/src/ui/Overlays.cpp | 10 ---------- interface/src/ui/Overlays.h | 3 --- 4 files changed, 19 deletions(-) diff --git a/interface/src/ui/ImageOverlay.cpp b/interface/src/ui/ImageOverlay.cpp index 7024cff533..6f5a0e0669 100644 --- a/interface/src/ui/ImageOverlay.cpp +++ b/interface/src/ui/ImageOverlay.cpp @@ -114,11 +114,6 @@ void ImageOverlay::render() { } } -// TODO: handle only setting the included values... -QScriptValue ImageOverlay::getProperties() { - return QScriptValue(); -} - // TODO: handle only setting the included values... void ImageOverlay::setProperties(const QScriptValue& properties) { //qDebug() << "ImageOverlay::setProperties()... properties=" << &properties; diff --git a/interface/src/ui/ImageOverlay.h b/interface/src/ui/ImageOverlay.h index 84838954b6..cad38b1071 100644 --- a/interface/src/ui/ImageOverlay.h +++ b/interface/src/ui/ImageOverlay.h @@ -45,7 +45,6 @@ public: const xColor& getBackgroundColor() const { return _backgroundColor; } float getAlpha() const { return _alpha; } const QUrl& getImageURL() const { return _imageURL; } - QScriptValue getProperties(); // setters void setVisible(bool visible) { _visible = visible; } diff --git a/interface/src/ui/Overlays.cpp b/interface/src/ui/Overlays.cpp index 438e94ad60..d5de389efc 100644 --- a/interface/src/ui/Overlays.cpp +++ b/interface/src/ui/Overlays.cpp @@ -17,7 +17,6 @@ Overlays::~Overlays() { } void Overlays::init(QGLWidget* parent) { - qDebug() << "Overlays::init() parent=" << parent; _parent = parent; } @@ -38,14 +37,6 @@ unsigned int Overlays::addOverlay(const QScriptValue& properties) { return thisID; } -QScriptValue Overlays::getOverlayProperties(unsigned int id) { - if (!_imageOverlays.contains(id)) { - return QScriptValue(); - } - ImageOverlay* thisOverlay = _imageOverlays[id]; - return thisOverlay->getProperties(); -} - // TODO: make multi-threaded safe bool Overlays::editOverlay(unsigned int id, const QScriptValue& properties) { if (!_imageOverlays.contains(id)) { @@ -60,7 +51,6 @@ bool Overlays::editOverlay(unsigned int id, const QScriptValue& properties) { void Overlays::deleteOverlay(unsigned int id) { if (_imageOverlays.contains(id)) { _imageOverlays.erase(_imageOverlays.find(id)); - } } diff --git a/interface/src/ui/Overlays.h b/interface/src/ui/Overlays.h index 8b9f6eb8be..4e4abe3157 100644 --- a/interface/src/ui/Overlays.h +++ b/interface/src/ui/Overlays.h @@ -38,9 +38,6 @@ public slots: /// adds an overlay with the specific properties unsigned int addOverlay(const QScriptValue& properties); - /// gets the current overlay properties for a specific overlay - QScriptValue getOverlayProperties(unsigned int id); - /// edits an overlay updating only the included properties, will return the identified OverlayID in case of /// successful edit, if the input id is for an unknown overlay this function will have no effect bool editOverlay(unsigned int id, const QScriptValue& properties);