minor fix to be able to build without QWT

diff --git a/src/analyze/gui/chartwidget.h b/src/analyze/gui/chartwidget.h
index 74ab07c06f9edfd8243a00c721d13a93a116b518..fbca5d6374dd881f55fa930c6df70e5526bfc4ec 100644 (file)
--- a/src/analyze/gui/chartwidget.h
+++ b/src/analyze/gui/chartwidget.h
@@ -20,7 +20,6 @@
 #define CHARTWIDGET_H
 
 #include "gui_config.h"
-#include "contextmenuqwt.h"
 
 #include <memory>
 #include <QWidget>
@@ -40,6 +39,7 @@ class Chart;
 }
 #elif defined(QWT_FOUND)
 #include "chartwidgetqwtplot.h"
+#include "contextmenuqwt.h"
 class QAction;
 #endif
 

diff --git a/src/analyze/gui/histogramwidget.cpp b/src/analyze/gui/histogramwidget.cpp
index 45d97a5d5a66f6929b2d71bc7b10c1be5b9a9eb6..dedc79ed646473b31771656390e0b76996c8c006 100644 (file)
--- a/src/analyze/gui/histogramwidget.cpp
+++ b/src/analyze/gui/histogramwidget.cpp
@@ -214,12 +214,12 @@ void HistogramWidget::setModel(HistogramModel *model)
 #endif
 }
 
+#ifdef QWT_FOUND
 void HistogramWidget::updateOnSelected()
 {
     m_plot->setOptions(ChartOptions::GlobalOptions);
 }
 
-#ifdef QWT_FOUND
 void HistogramWidget::modelReset()
 {
     m_plot->rebuild();

diff --git a/src/analyze/gui/histogramwidget.h b/src/analyze/gui/histogramwidget.h
index f2f96629cbdf8f1cbc3690356f70414e0cd3928d..45aa1f23913d4cf7367d8751fc683ee2017aa377 100644 (file)
--- a/src/analyze/gui/histogramwidget.h
+++ b/src/analyze/gui/histogramwidget.h
@@ -20,7 +20,6 @@
 #define HISTOGRAMWIDGET_H
 
 #include "gui_config.h"
-#include "contextmenuqwt.h"
 
 #include <memory>
 #include <QWidget>
@@ -39,6 +38,7 @@ class BarDiagram;
 }
 #elif defined(QWT_FOUND)
 #include "histogramwidgetqwtplot.h"
+#include "contextmenuqwt.h"
 #endif
 
 class HistogramModel;
@@ -52,9 +52,9 @@ public:
 
     void setModel(HistogramModel* model);
 
+#ifdef QWT_FOUND
     void updateOnSelected();
 
-#ifdef QWT_FOUND
 public slots:
     void modelReset();
 protected: