Changed name of main window periodic update function so that is not the same name as QWidget base update function.
This commit is contained in:
parent
f9b5796ef0
commit
1a99903933
|
@ -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;
|
||||
|
|
|
@ -78,7 +78,7 @@ class consoleWin_t : public QMainWindow
|
|||
void aboutQPlot(void);
|
||||
void openGamePadConfWin(void);
|
||||
void openGameSndConfWin(void);
|
||||
void update(void);
|
||||
void updatePeriodic(void);
|
||||
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue