fixes post-rebase

2 files changed, 1 insertions, 9 deletions

diff --git a/src/waveform/renderers/waveformrenderbackground.cpp b/src/waveform/renderers/waveformrenderbackground.cpp
index b7e6593094..abe095f19d 100644
--- a/src/waveform/renderers/waveformrenderbackground.cpp
+++ b/src/waveform/renderers/waveformrenderbackground.cpp
@@ -39,8 +39,6 @@ void WaveformRenderBackground::drawImage(QPainter* painter) {
     // This produces a white back ground with Linux QT 4.6 QGlWidget and
     // Intel i915 driver and has peroformance issues on other setups. See #6363
     //painter->drawPixmap(QPoint(0, 0), m_backgroundPixmap);
-
-    return true;
 }
 
 void WaveformRenderBackground::draw(QPainter* painter,
diff --git a/src/waveform/widgets/glwaveformwidgetabstract.h b/src/waveform/widgets/glwaveformwidgetabstract.h
index 8e216f680d..b361c05bab 100644
--- a/src/waveform/widgets/glwaveformwidgetabstract.h
+++ b/src/waveform/widgets/glwaveformwidgetabstract.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "waveform/renderers/glwaveformrenderer.h"
 #include "waveform/sharedglcontext.h"
 #include "waveform/widgets/waveformwidgetabstract.h"
 #include "widget/wglwidget.h"
@@ -39,12 +40,5 @@ class GLWaveformWidgetAbstract : public WaveformWidgetAbstract, public WGLWidget
         }
     }
 
-    GLWaveformRendererSignal* m_pGlRenderer;
-
-  private:
-#ifdef MIXXX_USE_QOPENGL
-    void handleEventFromWindow(QEvent* ev) override;
-#endif
-
 #endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 };