From b7134c75c390a89b57616aaaf6ef0f97b020cbbb Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 29 Jan 2016 12:14:47 +1300 Subject: [PATCH] Rename OpenGLInfo to OpenGLVersionChecker --- .../src/{OpenGLInfo.cpp => OpenGLVersionChecker.cpp} | 8 ++++---- .../src/{OpenGLInfo.h => OpenGLVersionChecker.h} | 12 ++++++------ interface/src/main.cpp | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) rename interface/src/{OpenGLInfo.cpp => OpenGLVersionChecker.cpp} (91%) rename interface/src/{OpenGLInfo.h => OpenGLVersionChecker.h} (58%) diff --git a/interface/src/OpenGLInfo.cpp b/interface/src/OpenGLVersionChecker.cpp similarity index 91% rename from interface/src/OpenGLInfo.cpp rename to interface/src/OpenGLVersionChecker.cpp index b61863c1bf..d509d6aaab 100644 --- a/interface/src/OpenGLInfo.cpp +++ b/interface/src/OpenGLVersionChecker.cpp @@ -1,5 +1,5 @@ // -// OpenGLInfo.cpp +// OpenGLVersionChecker.cpp // interface/src // // Created by David Rowe on 28 Jan 2016. @@ -9,19 +9,19 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include "OpenGLInfo.h" +#include "OpenGLVersionChecker.h" #include #include #include "GLCanvas.h" -OpenGLInfo::OpenGLInfo(int& argc, char** argv) : +OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) : QApplication(argc, argv) { } -bool OpenGLInfo::isValidVersion() { +bool OpenGLVersionChecker::isValidVersion() { bool valid = true; // Retrieve OpenGL version diff --git a/interface/src/OpenGLInfo.h b/interface/src/OpenGLVersionChecker.h similarity index 58% rename from interface/src/OpenGLInfo.h rename to interface/src/OpenGLVersionChecker.h index 8df44c72b1..a46020031c 100644 --- a/interface/src/OpenGLInfo.h +++ b/interface/src/OpenGLVersionChecker.h @@ -1,5 +1,5 @@ // -// OpenGLInfo.h +// OpenGLVersionChecker.h // interface/src // // Created by David Rowe on 28 Jan 2016. @@ -9,17 +9,17 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef hifi_OpenGLInfo_h -#define hifi_OpenGLInfo_h +#ifndef hifi_OpenGLVersionChecker_h +#define hifi_OpenGLVersionChecker_h #include -class OpenGLInfo : public QApplication { +class OpenGLVersionChecker : public QApplication { public: - OpenGLInfo(int& argc, char** argv); + OpenGLVersionChecker(int& argc, char** argv); static bool isValidVersion(); }; -#endif // hifi_OpenGLInfo_h +#endif // hifi_OpenGLVersionChecker_h diff --git a/interface/src/main.cpp b/interface/src/main.cpp index db02994a19..745bf94b8c 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -22,7 +22,7 @@ #include "AddressManager.h" #include "Application.h" #include "InterfaceLogging.h" -#include "OpenGLInfo.h" +#include "OpenGLVersionChecker.h" #include "MainWindow.h" int main(int argc, const char* argv[]) { @@ -88,8 +88,8 @@ int main(int argc, const char* argv[]) { // This is done separately from the main Application so that start-up and shut-down logic within the main Application is // not made more complicated than it already is. { - OpenGLInfo openGLInfo(argc, const_cast(argv)); - if (!openGLInfo.isValidVersion()) { + OpenGLVersionChecker openGLVersionChecker(argc, const_cast(argv)); + if (!openGLVersionChecker.isValidVersion()) { qCDebug(interfaceapp, "Early exit due to OpenGL version."); return 0; }