From cf66402dfe43e1f4219a64e89018a63d565286b5 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 21 Sep 2020 15:14:32 +0200 Subject: [PATCH] const correctness MainWindowInterface --- src/common/interfaces/mainwindow_interface.h | 2 +- src/meshlab/glarea.h | 6 +++--- src/meshlab/mainwindow.h | 3 +-- src/meshlab/mainwindow_RunTime.cpp | 8 +------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/common/interfaces/mainwindow_interface.h b/src/common/interfaces/mainwindow_interface.h index 7de967f0f..f4989799a 100644 --- a/src/common/interfaces/mainwindow_interface.h +++ b/src/common/interfaces/mainwindow_interface.h @@ -34,7 +34,7 @@ It is used as base class of the MainWindow. class MainWindowInterface { public: - virtual void executeFilter(QAction *, RichParameterList &, bool = false) {} + virtual void executeFilter(const QAction *, RichParameterList &, bool = false) {} //parexpval is a string map containing the parameter expression values set in the filter's dialog. //These parameter expression values will be evaluated when the filter will start. }; diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h index 1e91b714f..7b8c58a58 100644 --- a/src/meshlab/glarea.h +++ b/src/meshlab/glarea.h @@ -154,8 +154,8 @@ public: QSize minimumSizeHint() const; QSize sizeHint() const; - QAction *getLastAppliedFilter() {return lastFilterRef;} - void setLastAppliedFilter(QAction *qa) {lastFilterRef = qa;} + const QAction *getLastAppliedFilter() {return lastFilterRef;} + void setLastAppliedFilter(const QAction *qa) {lastFilterRef = qa;} ////RenderMode* getCurrentRenderMode(); //RenderMode* getCurrentRenderMode() @@ -449,7 +449,7 @@ private: //shader support RenderPluginInterface *iRenderer; QAction *currentShader; - QAction *lastFilterRef; // reference to last filter applied + const QAction *lastFilterRef; // reference to last filter applied QFont qFont; //font settings // Editing support diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index 9992d31e7..da884959e 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -93,7 +93,7 @@ class MainWindow : public QMainWindow, public MainWindowInterface public: // callback function to execute a filter - void executeFilter(QAction *action, RichParameterList &srcpar, bool isPreview = false); + void executeFilter(const QAction *action, RichParameterList &srcpar, bool isPreview = false); MainWindow(); ~MainWindow(); @@ -178,7 +178,6 @@ private slots: void suspendEditMode(); ///////////Slot Menu Filter //////////////////////// void startFilter(); - void applyLastFilter(); void runFilterScript(); void showFilterScript(); void showTooltip(QAction*); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index f13c13acf..45479f4c7 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -757,12 +757,6 @@ void MainWindow::endEdit() updateLayerDialog(); } -void MainWindow::applyLastFilter() -{ - if(GLA()==nullptr) return; - GLA()->getLastAppliedFilter()->activate(QAction::Trigger); -} - void MainWindow::showFilterScript() { if (meshDoc()->filterHistory != nullptr) @@ -1142,7 +1136,7 @@ from the user defined dialog */ -void MainWindow::executeFilter(QAction *action, RichParameterList ¶ms, bool isPreview) +void MainWindow::executeFilter(const QAction* action, RichParameterList ¶ms, bool isPreview) { FilterPluginInterface *iFilter = qobject_cast(action->parent()); qb->show();