From 1a99903933574c416b3b6fa1964554c1dbf6710a Mon Sep 17 00:00:00 2001
From: Matthew Budd <mjbudd77@gmail.com>
Date: Sun, 5 Jul 2020 22:10:28 -0400
Subject: [PATCH] Changed name of main window periodic update function so that
 is not the same name as QWidget base update function.

---
 src/drivers/Qt/ConsoleWindow.cpp | 4 ++--
 src/drivers/Qt/ConsoleWindow.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp
index d1377c41..19a779f2 100644
--- a/src/drivers/Qt/ConsoleWindow.cpp
+++ b/src/drivers/Qt/ConsoleWindow.cpp
@@ -29,7 +29,7 @@ consoleWin_t::consoleWin_t(QWidget *parent)
 
    connect(emulatorThread, &QThread::finished, emulatorThread, &QObject::deleteLater);
 
-	connect( gameTimer, &QTimer::timeout, this, &consoleWin_t::update );
+	connect( gameTimer, &QTimer::timeout, this, &consoleWin_t::updatePeriodic );
 
 	gameTimer->setTimerType( Qt::PreciseTimer );
 	//gameTimer->start( 16 ); // 60hz
@@ -277,7 +277,7 @@ void consoleWin_t::aboutQPlot(void)
    return;
 }
 
-void consoleWin_t::update(void)
+void consoleWin_t::updatePeriodic(void)
 {
 	//struct timespec ts;
 	//double t;
diff --git a/src/drivers/Qt/ConsoleWindow.h b/src/drivers/Qt/ConsoleWindow.h
index 10444c5a..672d4546 100644
--- a/src/drivers/Qt/ConsoleWindow.h
+++ b/src/drivers/Qt/ConsoleWindow.h
@@ -78,7 +78,7 @@ class  consoleWin_t : public QMainWindow
       void aboutQPlot(void);
       void openGamePadConfWin(void);
       void openGameSndConfWin(void);
-      void update(void);
+      void updatePeriodic(void);
 
 };