From d1e648b39234084fac6fca18c196778a3fdab181 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 25 Feb 2015 12:34:38 -0800
Subject: [PATCH] remove unused references to QGLWidget* parent in Overlay and
 Overlays

---
 interface/src/Application.cpp          | 2 +-
 interface/src/UIUtil.cpp               | 4 ----
 interface/src/ui/overlays/Overlay.cpp  | 5 +----
 interface/src/ui/overlays/Overlay.h    | 3 +--
 interface/src/ui/overlays/Overlays.cpp | 5 ++---
 interface/src/ui/overlays/Overlays.h   | 3 +--
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 772c314783..5c6b370cfb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -473,7 +473,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     checkVersion();
 
-    _overlays.init(_glWidget); // do this before scripts load
+    _overlays.init(); // do this before scripts load
 
     _runningScriptsWidget->setRunningScripts(getRunningScripts());
     connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript);
diff --git a/interface/src/UIUtil.cpp b/interface/src/UIUtil.cpp
index 03195c5e75..8951ada5a6 100644
--- a/interface/src/UIUtil.cpp
+++ b/interface/src/UIUtil.cpp
@@ -12,8 +12,6 @@
 #include <QStyle>
 #include <QStyleOptionTitleBar>
 
-//#include "DependencyManager.h"
-#include "Application.h"
 #include "GLCanvas.h"
 
 #include "UIUtil.h"
@@ -45,8 +43,6 @@ int UIUtil::getWindowTitleBarHeight(const QWidget* window) {
 // this function at all.  If you mix both you will end up with inconsistent results
 // across platforms.
 void UIUtil::scaleWidgetFontSizes(QWidget* widget) {
-    auto glCanvas = Application::getInstance()->getGLWidget();
-
     // This is the base dpi that we are targetting.  This is based on Mac OSXs default DPI,
     // and is the basis for all font sizes.
     const float BASE_DPI = 72.0f;
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index fd7aaca717..b7700d8299 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -20,7 +20,6 @@
 
 
 Overlay::Overlay() :
-    _parent(NULL),
     _isLoaded(true),
     _alpha(DEFAULT_ALPHA),
     _glowLevel(0.0f),
@@ -40,7 +39,6 @@ Overlay::Overlay() :
 }
 
 Overlay::Overlay(const Overlay* overlay) :
-    _parent(NULL),
     _isLoaded(overlay->_isLoaded),
     _alpha(overlay->_alpha),
     _glowLevel(overlay->_glowLevel),
@@ -60,8 +58,7 @@ Overlay::Overlay(const Overlay* overlay) :
 {
 }
 
-void Overlay::init(QGLWidget* parent, QScriptEngine* scriptEngine) {
-    _parent = parent;
+void Overlay::init(QScriptEngine* scriptEngine) {
     _scriptEngine = scriptEngine;
 }
 
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index 99ab588197..b921c2ddbb 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -38,7 +38,7 @@ public:
     Overlay();
     Overlay(const Overlay* overlay);
     ~Overlay();
-    void init(QGLWidget* parent, QScriptEngine* scriptEngine);
+    void init(QScriptEngine* scriptEngine);
     virtual void update(float deltatime) {}
     virtual void render(RenderArgs* args) = 0;
 
@@ -85,7 +85,6 @@ public:
 protected:
     float updatePulse();
 
-    QGLWidget* _parent;
     bool _isLoaded;
     float _alpha;
     float _glowLevel;
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index 8ba7ddea00..c7b350f100 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -58,8 +58,7 @@ Overlays::~Overlays() {
     
 }
 
-void Overlays::init(QGLWidget* parent) {
-    _parent = parent;
+void Overlays::init() {
     _scriptEngine = new QScriptEngine();
 }
 
@@ -202,7 +201,7 @@ unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& prope
 }
 
 unsigned int Overlays::addOverlay(Overlay* overlay) {
-    overlay->init(_parent, _scriptEngine);
+    overlay->init(_scriptEngine);
 
     QWriteLocker lock(&_lock);
     unsigned int thisID = _nextOverlayID;
diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
index 94ac6f98bb..42227d04f6 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -51,7 +51,7 @@ class Overlays : public QObject {
 public:
     Overlays();
     ~Overlays();
-    void init(QGLWidget* parent);
+    void init();
     void update(float deltatime);
     void renderWorld(bool drawFront, RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE,
                         RenderArgs::RenderSide renderSide = RenderArgs::MONO);
@@ -95,7 +95,6 @@ private:
     QMap<unsigned int, Overlay*> _overlaysWorld;
     QList<Overlay*> _overlaysToDelete;
     unsigned int _nextOverlayID;
-    QGLWidget* _parent;
     QReadWriteLock _lock;
     QReadWriteLock _deleteLock;
     QScriptEngine* _scriptEngine;