From 20205149745452043015078c2bdad78ee6722b5b Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 29 Jan 2016 12:29:21 +1300
Subject: [PATCH] Move OpenGLVersionChecker to gl library

---
 interface/src/main.cpp                                 |  2 +-
 .../gl/src/gl}/OpenGLVersionChecker.cpp                | 10 +++++-----
 .../src => libraries/gl/src/gl}/OpenGLVersionChecker.h |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename {interface/src => libraries/gl/src/gl}/OpenGLVersionChecker.cpp (93%)
 rename {interface/src => libraries/gl/src/gl}/OpenGLVersionChecker.h (95%)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 745bf94b8c..a57e53b384 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -17,12 +17,12 @@
 #include <QSharedMemory>
 #include <QTranslator>
 
+#include <gl/OpenGLVersionChecker.h>
 #include <SharedUtil.h>
 
 #include "AddressManager.h"
 #include "Application.h"
 #include "InterfaceLogging.h"
-#include "OpenGLVersionChecker.h"
 #include "MainWindow.h"
 
 int main(int argc, const char* argv[]) {
diff --git a/interface/src/OpenGLVersionChecker.cpp b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
similarity index 93%
rename from interface/src/OpenGLVersionChecker.cpp
rename to libraries/gl/src/gl/OpenGLVersionChecker.cpp
index d509d6aaab..f1a40bde8d 100644
--- a/interface/src/OpenGLVersionChecker.cpp
+++ b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
@@ -1,6 +1,6 @@
 //
 //  OpenGLVersionChecker.cpp
-//  interface/src
+//  libraries/gl/src/gl
 //
 //  Created by David Rowe on 28 Jan 2016.
 //  Copyright 2016 High Fidelity, Inc.
@@ -14,7 +14,7 @@
 #include <QMessageBox>
 #include <QRegularExpression>
 
-#include "GLCanvas.h"
+#include "GLWidget.h"
 
 OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) :
     QApplication(argc, argv)
@@ -25,10 +25,10 @@ bool OpenGLVersionChecker::isValidVersion() {
     bool valid = true;
 
     // Retrieve OpenGL version
-    GLCanvas* glCanvas = new GLCanvas();
-    glCanvas->initializeGL();
+    GLWidget* glWidget = new GLWidget();
+    glWidget->initializeGL();
     QString glVersion = QString((const char*)glGetString(GL_VERSION));
-    delete glCanvas;
+    delete glWidget;
 
     // Compare against minimum
     // The GL_VERSION string begins with a version number in one of these forms:
diff --git a/interface/src/OpenGLVersionChecker.h b/libraries/gl/src/gl/OpenGLVersionChecker.h
similarity index 95%
rename from interface/src/OpenGLVersionChecker.h
rename to libraries/gl/src/gl/OpenGLVersionChecker.h
index a46020031c..3e16c3a32d 100644
--- a/interface/src/OpenGLVersionChecker.h
+++ b/libraries/gl/src/gl/OpenGLVersionChecker.h
@@ -1,6 +1,6 @@
 //
 //  OpenGLVersionChecker.h
-//  interface/src
+//  libraries/gl/src/gl
 //
 //  Created by David Rowe on 28 Jan 2016.
 //  Copyright 2016 High Fidelity, Inc.