From b052ca5ca2011f2023cd4fd747db94fdd9185d5a Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 21 Jun 2020 17:16:11 -0400 Subject: [PATCH] Switch to Qt-style member naming. --- OSBindings/Qt/scantargetwidget.cpp | 8 ++++---- OSBindings/Qt/scantargetwidget.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OSBindings/Qt/scantargetwidget.cpp b/OSBindings/Qt/scantargetwidget.cpp index 42706dcd1..d1582a8f9 100644 --- a/OSBindings/Qt/scantargetwidget.cpp +++ b/OSBindings/Qt/scantargetwidget.cpp @@ -21,18 +21,18 @@ void ScanTargetWidget::initializeGL() { void ScanTargetWidget::paintGL() { glClear(GL_COLOR_BUFFER_BIT); if(scanTarget) { - vsync_predictor_.begin_redraw(); + vsyncPredictor.begin_redraw(); scanTarget->update(width(), height()); scanTarget->draw(width(), height()); - vsync_predictor_.end_redraw(); + vsyncPredictor.end_redraw(); } } void ScanTargetWidget::vsync() { - vsync_predictor_.announce_vsync(); + vsyncPredictor.announce_vsync(); const auto time_now = Time::nanos_now(); - const auto delay_time = ((vsync_predictor_.suggested_draw_time() - time_now) / 1'000'000) - 5; // TODO: the extra 5 is a random guess. + const auto delay_time = ((vsyncPredictor.suggested_draw_time() - time_now) / 1'000'000) - 5; // TODO: the extra 5 is a random guess. if(delay_time > 0) { QTimer::singleShot(delay_time, this, SLOT(repaint())); } else { diff --git a/OSBindings/Qt/scantargetwidget.h b/OSBindings/Qt/scantargetwidget.h index e07218422..36b328101 100644 --- a/OSBindings/Qt/scantargetwidget.h +++ b/OSBindings/Qt/scantargetwidget.h @@ -23,7 +23,7 @@ class ScanTargetWidget : public QOpenGLWidget // This should be created only once there's an OpenGL context. So it // can't be done at creation time. std::unique_ptr scanTarget; - Time::VSyncPredictor vsync_predictor_; + Time::VSyncPredictor vsyncPredictor; private slots: void vsync();