From cd27292094cc6733d79a6e060801ced00fd4bc06 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Wed, 9 Oct 2013 16:25:23 +0000 Subject: [PATCH] - removed useless dynamic_cast --- src/meshlab/glarea.cpp | 2 +- src/meshlab/glarea.h | 14 ++++---------- src/meshlab/multiViewer_Container.cpp | 8 ++------ src/meshlab/multiViewer_Container.h | 7 ++++--- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp index 2e9acd5ed..850ff9f07 100644 --- a/src/meshlab/glarea.cpp +++ b/src/meshlab/glarea.cpp @@ -43,7 +43,7 @@ GLArea::GLArea(MultiViewer_Container *mvcont, RichParameterSet *current) : QGLWidget(),interrbutshow(false) { this->setParent(mvcont); - + parentmultiview = mvcont; this->updateCustomSettingValues(*current); animMode=AnimNone; iRenderer=0; //Shader support diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h index 4e0289de3..d5e44610b 100644 --- a/src/meshlab/glarea.h +++ b/src/meshlab/glarea.h @@ -39,9 +39,9 @@ #include "../common/interfaces.h" #include "glarea_setting.h" -#include "multiViewer_Container.h" #include "snapshotsetting.h" #include "rendermodeactions.h" +#include "multiViewer_Container.h" #define SSHOT_BYTES_PER_PIXEL 4 @@ -50,6 +50,7 @@ enum LightingModel{LDOUBLE,LFANCY}; class MeshModel; class MainWindow; + class GLArea : public QGLWidget { Q_OBJECT @@ -63,6 +64,7 @@ public: private: int id; //the very important unique id of each subwindow. + MultiViewer_Container* parentmultiview; public: int getId() {return id;} @@ -72,15 +74,7 @@ public: //MultiViewer_Container *mvc() MultiViewer_Container * mvc() { - QObject * curParent = this->parent(); - while(dynamic_cast(curParent) == 0) - { - if (curParent != NULL) - curParent = curParent->parent(); - else - return NULL; - } - return dynamic_cast(curParent); + return parentmultiview; } MainWindow *mw(); diff --git a/src/meshlab/multiViewer_Container.cpp b/src/meshlab/multiViewer_Container.cpp index 1c838f5f7..b5d8cd3c9 100644 --- a/src/meshlab/multiViewer_Container.cpp +++ b/src/meshlab/multiViewer_Container.cpp @@ -63,16 +63,12 @@ void SplitterHandle::mousePressEvent ( QMouseEvent * e ) MultiViewer_Container::MultiViewer_Container(QWidget *parent) : Splitter(parent) { - setChildrenCollapsible(false); + setChildrenCollapsible(false); - currentId=-1; + currentId=-1; } -MultiViewer_Container::~MultiViewer_Container() -{ -} - int MultiViewer_Container::getNextViewerId(){ int newId=-1; diff --git a/src/meshlab/multiViewer_Container.h b/src/meshlab/multiViewer_Container.h index b7306a484..28633c272 100644 --- a/src/meshlab/multiViewer_Container.h +++ b/src/meshlab/multiViewer_Container.h @@ -42,6 +42,7 @@ class Splitter : public QSplitter public: Splitter ( QWidget * parent); Splitter(Qt::Orientation orientation, QWidget *parent = 0); + ~Splitter() {} MultiViewer_Container *getRootContainer(); @@ -55,6 +56,7 @@ class SplitterHandle : public QSplitterHandle public: SplitterHandle(Qt::Orientation orientation, QSplitter *parent); + ~SplitterHandle() {} protected: void mousePressEvent ( QMouseEvent * e ); @@ -67,9 +69,8 @@ class MultiViewer_Container : public Splitter typedef vcg::Shot Shot; public: - MultiViewer_Container(QWidget *parent); - - ~MultiViewer_Container(); + MultiViewer_Container(QWidget *parent); + ~MultiViewer_Container() {} void addView(GLArea* viewer, Qt::Orientation); void removeView(int);