From 95d055da2c2bf6f556bf05c7a795067d40d91cef Mon Sep 17 00:00:00 2001
From: Matthew Budd <mjbudd77@gmail.com>
Date: Mon, 29 Jun 2020 08:15:26 -0400
Subject: [PATCH] Renamed openGL based game viewer so to distinguish it from
 others that will be tested.

---
 fceux.pro                                           |  4 ++--
 src/drivers/Qt/GameApp.cpp                          |  2 +-
 src/drivers/Qt/GameApp.h                            |  6 ++----
 src/drivers/Qt/{GameViewer.cpp => GameViewerGL.cpp} | 12 ++++++------
 src/drivers/Qt/{GameViewer.h => GameViewerGL.h}     |  8 ++++----
 5 files changed, 15 insertions(+), 17 deletions(-)
 rename src/drivers/Qt/{GameViewer.cpp => GameViewerGL.cpp} (96%)
 rename src/drivers/Qt/{GameViewer.h => GameViewerGL.h} (65%)

diff --git a/fceux.pro b/fceux.pro
index aa43cddb..93ad5b28 100644
--- a/fceux.pro
+++ b/fceux.pro
@@ -293,11 +293,11 @@ SOURCES += src/drivers/common/vidblit.cpp
 SOURCES += src/drivers/common/nes_ntsc.c
 
 HEADERS += src/drivers/Qt/GameApp.h  
-HEADERS += src/drivers/Qt/GameViewer.h  
+HEADERS += src/drivers/Qt/GameViewerGL.h  
 HEADERS += src/drivers/Qt/GamePadConf.h  
 SOURCES += src/drivers/Qt/main.cpp  
 SOURCES += src/drivers/Qt/GameApp.cpp  
-SOURCES += src/drivers/Qt/GameViewer.cpp  
+SOURCES += src/drivers/Qt/GameViewerGL.cpp  
 SOURCES += src/drivers/Qt/GamePadConf.cpp  
 SOURCES += src/drivers/Qt/fceuWrapper.cpp  
 SOURCES += src/drivers/Qt/config.cpp  
diff --git a/src/drivers/Qt/GameApp.cpp b/src/drivers/Qt/GameApp.cpp
index 83966b8f..274a4507 100644
--- a/src/drivers/Qt/GameApp.cpp
+++ b/src/drivers/Qt/GameApp.cpp
@@ -19,7 +19,7 @@ gameWin_t::gameWin_t(QWidget *parent)
 
 	createMainMenu();
 
-	viewport = new gameView_t();
+	viewport = new gameViewGL_t();
 	//viewport.resize( 200, 200 );
 
 	layout->addWidget(viewport);
diff --git a/src/drivers/Qt/GameApp.h b/src/drivers/Qt/GameApp.h
index c813f3bf..d2500b82 100644
--- a/src/drivers/Qt/GameApp.h
+++ b/src/drivers/Qt/GameApp.h
@@ -15,7 +15,7 @@
 #include <QKeyEvent>
 #include <QTimer>
 
-#include "Qt/GameViewer.h"
+#include "Qt/GameViewerGL.h"
 #include "Qt/GamePadConf.h"
 
 class  gameWin_t : public QMainWindow
@@ -26,9 +26,7 @@ class  gameWin_t : public QMainWindow
 		gameWin_t(QWidget *parent = 0);
 	   ~gameWin_t(void);
 
-		gameView_t *viewport;
-		//QPushButton hello( "Hello world!", 0 );
-		//
+		gameViewGL_t *viewport;
 
 	 QMenu *fileMenu;
     QMenu *optMenu;
diff --git a/src/drivers/Qt/GameViewer.cpp b/src/drivers/Qt/GameViewerGL.cpp
similarity index 96%
rename from src/drivers/Qt/GameViewer.cpp
rename to src/drivers/Qt/GameViewerGL.cpp
index 788767d0..0e6d295e 100644
--- a/src/drivers/Qt/GameViewer.cpp
+++ b/src/drivers/Qt/GameViewerGL.cpp
@@ -6,12 +6,12 @@
 #include <math.h>
 
 #include "Qt/gl_win.h"
-#include "Qt/GameViewer.h"
+#include "Qt/GameViewerGL.h"
 
 extern unsigned int gui_draw_area_width;
 extern unsigned int gui_draw_area_height;
 
-gameView_t::gameView_t(QWidget *parent)
+gameViewGL_t::gameViewGL_t(QWidget *parent)
 	: QOpenGLWidget( parent )
 {
 	view_width  = 0;
@@ -36,7 +36,7 @@ gameView_t::gameView_t(QWidget *parent)
 	//setFormat( fmt );
 }
 
-gameView_t::~gameView_t(void)
+gameViewGL_t::~gameViewGL_t(void)
 {
 	// Make sure the context is current and then explicitly
     // destroy all underlying OpenGL resources.
@@ -53,7 +53,7 @@ gameView_t::~gameView_t(void)
 	 doneCurrent();
 }
 
-void gameView_t::initializeGL(void)
+void gameViewGL_t::initializeGL(void)
 {
 	int ipolate = 0;
 
@@ -92,7 +92,7 @@ void gameView_t::initializeGL(void)
 	 glTexParameteri(GL_TEXTURE_RECTANGLE,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE);
 }
 
-void gameView_t::resizeGL(int w, int h)
+void gameViewGL_t::resizeGL(int w, int h)
 {
 	printf("GL Resize: %i x %i \n", w, h );
 	glViewport(0, 0, w, h);
@@ -104,7 +104,7 @@ void gameView_t::resizeGL(int w, int h)
 	gui_draw_area_height = h;
 }
 
-void gameView_t::paintGL(void)
+void gameViewGL_t::paintGL(void)
 {
 	int l=0, r=gl_shm->ncol;
 	int t=0, b=gl_shm->nrow;
diff --git a/src/drivers/Qt/GameViewer.h b/src/drivers/Qt/GameViewerGL.h
similarity index 65%
rename from src/drivers/Qt/GameViewer.h
rename to src/drivers/Qt/GameViewerGL.h
index edc0524a..fda2ff53 100644
--- a/src/drivers/Qt/GameViewer.h
+++ b/src/drivers/Qt/GameViewerGL.h
@@ -1,4 +1,4 @@
-// GameViewer.h
+// GameViewerGL.h
 //
 
 #pragma  once
@@ -6,13 +6,13 @@
 #include <QOpenGLWidget>
 #include <QOpenGLFunctions>
 
-class gameView_t : public QOpenGLWidget, protected QOpenGLFunctions
+class gameViewGL_t : public QOpenGLWidget, protected QOpenGLFunctions
 {
     Q_OBJECT
 
 	public:
-		gameView_t(QWidget *parent = 0);
-	   ~gameView_t(void);
+		gameViewGL_t(QWidget *parent = 0);
+	   ~gameViewGL_t(void);
 
 		float angle;