Bug#1058863: libqwt-qt5-dev: invalid conversion from ‘int’ to ‘QwtPlotLayout::Option’

[Gudjon I. Gudjonsson]

Hi Yadd

The changes are added to your patch below.
Please change the control file with dependency on
libqwt-qt6-dev

Regards
Gudjon 

Description: drop QWT
Author: Yadd <y...@debian.org>
Forwarded: not-needed
Last-Update: 2023-12-19

--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -21,9 +21,6 @@
 #######################################################################################
 
 ADD_SUBDIRECTORY(function2)
-IF(OVITO_BUILD_APP AND NOT OVITO_QML_GUI)
-    ADD_SUBDIRECTORY(qwt)
-ENDIF()
 IF(OVITO_BUILD_PLUGIN_PARTICLES)
     ADD_SUBDIRECTORY(ptm)
     ADD_SUBDIRECTORY(mwm_csp)
--- a/src/ovito/correlation/gui/CMakeLists.txt
+++ b/src/ovito/correlation/gui/CMakeLists.txt
@@ -24,7 +24,7 @@
 OVITO_STANDARD_PLUGIN(CorrelationFunctionPluginGui
     SOURCES
         SpatialCorrelationFunctionModifierEditor.cpp
-    PRIVATE_LIB_DEPENDENCIES Qwt
+    PRIVATE_LIB_DEPENDENCIES qwt-qt6
     PLUGIN_DEPENDENCIES CorrelationFunctionPlugin ParticlesGui
     GUI_PLUGIN
     HAS_NO_EXPORTS
--- a/src/ovito/particles/gui/CMakeLists.txt
+++ b/src/ovito/particles/gui/CMakeLists.txt
@@ -83,7 +83,7 @@
         export/vasp/POSCARExporterEditor.cpp
         export/xyz/XYZExporterEditor.cpp
         resources/particles_gui.qrc
-    PRIVATE_LIB_DEPENDENCIES Qwt PolyhedralTemplateMatching
+    PRIVATE_LIB_DEPENDENCIES qwt-qt6 PolyhedralTemplateMatching
     PLUGIN_DEPENDENCIES Particles StdObjGui
     PRECOMPILED_HEADERS ParticlesGui.h
     GUI_PLUGIN
--- a/src/ovito/stdmod/gui/CMakeLists.txt
+++ b/src/ovito/stdmod/gui/CMakeLists.txt
@@ -42,7 +42,7 @@
         CombineDatasetsModifierEditor.cpp
         ColorByTypeModifierEditor.cpp
     PLUGIN_DEPENDENCIES StdMod StdObjGui
-    PRIVATE_LIB_DEPENDENCIES Qwt
+    PRIVATE_LIB_DEPENDENCIES qwt-qt6
     PRECOMPILED_HEADERS StdModGui.h
     GUI_PLUGIN
     HAS_NO_EXPORTS
--- a/src/ovito/stdobj/gui/CMakeLists.txt
+++ b/src/ovito/stdobj/gui/CMakeLists.txt
@@ -39,7 +39,7 @@
         widgets/PropertySelectionComboBox.cpp
         widgets/DataTablePlotWidget.cpp
     PLUGIN_DEPENDENCIES StdObj
-    LIB_DEPENDENCIES Qwt
+    LIB_DEPENDENCIES qwt-qt6
     PRECOMPILED_HEADERS StdObjGui.h
     GUI_PLUGIN
 )
--- a/src/ovito/crystalanalysis/gui/modifier/GrainSegmentationModifierEditor.cpp
+++ b/src/ovito/crystalanalysis/gui/modifier/GrainSegmentationModifierEditor.cpp
@@ -33,7 +33,7 @@
 #include <ovito/core/dataset/pipeline/ModifierApplication.h>
 #include "GrainSegmentationModifierEditor.h"

-#include <3rdparty/qwt/qwt_plot_zoneitem.h>
+#include <qwt/qwt_plot_zoneitem.h>

 namespace Ovito::CrystalAnalysis {

diff --git a/src/ovito/stdobj/gui/widgets/DataTablePlotWidget.h b/src/ovito/stdobj/gui/widgets/DataTablePlotWidget.h
index 1630924..d2104ae 100755
--- a/src/ovito/stdobj/gui/widgets/DataTablePlotWidget.h
+++ b/src/ovito/stdobj/gui/widgets/DataTablePlotWidget.h
@@ -76,14 +76,14 @@ public:
     }

     void setAxisAutoScale(int axisId, bool on = true) {
-        if(axisValid(axisId)) {
+        if(isAxisValid(axisId)) {
             _axisAutoscaleEnabled[axisId] = on;
             QwtPlot::setAxisAutoScale(axisId, on);
         }
     }

     void setAxisScale(int axisId, double min, double max, double stepSize = 0) {
-        if(axisValid(axisId)) {
+        if(isAxisValid(axisId)) {
             _axisAutoscaleEnabled[axisId] = false;
             QwtPlot::setAxisScale(axisId, min, max, stepSize);
         }