diff --git a/src/common/plugins/interfaces/iomesh_plugin.h b/src/common/plugins/interfaces/iomesh_plugin.h index ee5293dc9..49c17214b 100644 --- a/src/common/plugins/interfaces/iomesh_plugin.h +++ b/src/common/plugins/interfaces/iomesh_plugin.h @@ -132,8 +132,7 @@ public: MeshModel &m, /// The mesh that is filled with the file content int &mask, /// a bit mask that will be filled reporting what kind of data we have found in the file (per vertex color, texture coords etc) const RichParameterList & par, /// The parameters that have been set up in the initPreOpenParameter() - vcg::CallBackPos *cb = nullptr, /// standard callback for reporting progress in the loading - QWidget *parent = nullptr) = 0; /// you should not use this... + vcg::CallBackPos *cb = nullptr) = 0; /// standard callback for reporting progress in the loading virtual void save( const QString &format, // the extension of the format e.g. "PLY" @@ -141,8 +140,7 @@ public: MeshModel &m, const int mask,// a bit mask indicating what kind of the data present in the mesh should be saved (e.g. you could not want to save normals in ply files) const RichParameterList & par, - vcg::CallBackPos *cb = 0, - QWidget *parent = 0) = 0; + vcg::CallBackPos *cb) = 0; void wrongOpenFormat(const QString& format) { diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 348eaede5..e30338fec 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -2217,7 +2217,7 @@ bool MainWindow::loadMesh(const QString& fileName, IOMeshPlugin *pCurrentIOPlugi pCurrentIOPlugin->setLog(&meshDoc()->Log); try { - pCurrentIOPlugin->open(extension, fileNameSansDir, *mm ,mask,*prePar,QCallBack,this /*gla*/); + pCurrentIOPlugin->open(extension, fileNameSansDir, *mm ,mask,*prePar,QCallBack); } catch(const MLException& e) { QMessageBox::warning( @@ -2669,7 +2669,7 @@ bool MainWindow::exportMesh(QString fileName,MeshModel* mod,const bool saveAllPo QElapsedTimer tt; tt.start(); qb->reset(); try { - pCurrentIOPlugin->save(extension, fileName, *mod ,mask,savePar,QCallBack,this); + pCurrentIOPlugin->save(extension, fileName, *mod ,mask,savePar,QCallBack); GLA()->Logf(GLLogStream::SYSTEM, "Saved Mesh %s in %i msec", qUtf8Printable(fileName), tt.elapsed()); mod->setFileName(fileName); QSettings settings; diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp b/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp index 8369021be..8f13fbf52 100644 --- a/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp +++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.cpp @@ -183,8 +183,7 @@ void FilterSSynth::open( MeshModel &m, int& mask, const RichParameterList & par, - CallBackPos *cb, - QWidget *parent) + CallBackPos *cb) { if (formatName.toUpper() == tr("ES")){ this->seed=par.getInt("seed"); @@ -218,7 +217,7 @@ void FilterSSynth::open( } } -void FilterSSynth::save(const QString &formatName, const QString &/*fileName*/, MeshModel &/*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos */*cb*/, QWidget */*parent*/) +void FilterSSynth::save(const QString &formatName, const QString &/*fileName*/, MeshModel &/*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos */*cb*/) { wrongSaveFormat(formatName); } diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.h b/src/meshlabplugins/filter_ssynth/filter_ssynth.h index 04336c425..b9ead35ef 100644 --- a/src/meshlabplugins/filter_ssynth/filter_ssynth.h +++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.h @@ -60,8 +60,8 @@ class FilterSSynth : public QObject, public IOMeshPlugin, public FilterPlugin{ virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; void initPreOpenParameter(const QString &formatName, RichParameterList &parlst); - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); FilterPlugin::FilterArity filterArity(const QAction *) const {return NONE;} private: QString ssynth(QString grammar,int maxdepth,int seed,vcg::CallBackPos *cb); diff --git a/src/meshlabplugins/io_3ds/meshio.cpp b/src/meshlabplugins/io_3ds/meshio.cpp index a569c858c..76fe3d597 100644 --- a/src/meshlabplugins/io_3ds/meshio.cpp +++ b/src/meshlabplugins/io_3ds/meshio.cpp @@ -90,8 +90,7 @@ void ExtraMeshIOPlugin::open( MeshModel &m, int& mask, const RichParameterList& params, - CallBackPos *cb, - QWidget*) + CallBackPos *cb) { // initializing mask mask = 0; @@ -250,8 +249,7 @@ void ExtraMeshIOPlugin::save( MeshModel &m, const int mask, const RichParameterList &, - vcg::CallBackPos *cb, - QWidget *) + vcg::CallBackPos *cb) { QString errorMsgFormat = "Error encountered while exporting file %1:\n%2"; string filename = QFile::encodeName(fileName).constData (); diff --git a/src/meshlabplugins/io_3ds/meshio.h b/src/meshlabplugins/io_3ds/meshio.h index aa0244e6f..5428462fb 100644 --- a/src/meshlabplugins/io_3ds/meshio.h +++ b/src/meshlabplugins/io_3ds/meshio.h @@ -53,8 +53,7 @@ public: MeshModel &m, int& mask, const RichParameterList ¶ms, - vcg::CallBackPos *cb=0, - QWidget* parent=0); + vcg::CallBackPos *cb=0); void save( const QString &formatName, @@ -62,8 +61,7 @@ public: MeshModel &m, const int mask, const RichParameterList &, - vcg::CallBackPos *cb=0, - QWidget *parent= 0); + vcg::CallBackPos *cb=0); }; #endif diff --git a/src/meshlabplugins/io_base/baseio.cpp b/src/meshlabplugins/io_base/baseio.cpp index 7d3317110..5e305e10e 100644 --- a/src/meshlabplugins/io_base/baseio.cpp +++ b/src/meshlabplugins/io_base/baseio.cpp @@ -85,7 +85,7 @@ void BaseMeshIOPlugin::initPreOpenParameter(const QString &formatName, RichParam } } -void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/) +void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb) { //bool normalsUpdated = false; QString errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: %2"; @@ -286,7 +286,7 @@ void BaseMeshIOPlugin::open(const QString &formatName, const QString &fileName, if (cb != NULL) (*cb)(99, "Done"); } -void BaseMeshIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, CallBackPos *cb, QWidget * /*parent*/) +void BaseMeshIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, CallBackPos *cb) { QString errorMsgFormat = "Error encountered while exportering file %1:\n%2"; string filename = QFile::encodeName(fileName).constData(); diff --git a/src/meshlabplugins/io_base/baseio.h b/src/meshlabplugins/io_base/baseio.h index f5f81cb60..c46ae9215 100644 --- a/src/meshlabplugins/io_base/baseio.h +++ b/src/meshlabplugins/io_base/baseio.h @@ -43,8 +43,8 @@ public: void exportMaskCapability(const QString& format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb = 0, QWidget *parent = 0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb = 0, QWidget *parent = 0); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & par, vcg::CallBackPos *cb); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb); //void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterSet & par); //void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterSet &par); void initPreOpenParameter(const QString &formatName, RichParameterList &parlst); diff --git a/src/meshlabplugins/io_bre/io_bre.cpp b/src/meshlabplugins/io_bre/io_bre.cpp index 2e3bb80dc..265cb034f 100644 --- a/src/meshlabplugins/io_bre/io_bre.cpp +++ b/src/meshlabplugins/io_bre/io_bre.cpp @@ -131,7 +131,7 @@ void BreMeshIOPlugin::initPreOpenParameter(const QString &formatName, RichParame } -void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/) +void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb) { // initializing progress bar status if (cb != NULL) @@ -146,7 +146,7 @@ void BreMeshIOPlugin::open(const QString &/*formatName*/, const QString &fileNam } } -void BreMeshIOPlugin::save(const QString & formatName,const QString & /*fileName*/, MeshModel &, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos *, QWidget * /*parent*/) +void BreMeshIOPlugin::save(const QString & formatName,const QString & /*fileName*/, MeshModel &, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos *) { wrongSaveFormat(formatName); } diff --git a/src/meshlabplugins/io_bre/io_bre.h b/src/meshlabplugins/io_bre/io_bre.h index d95533ced..6f2258d41 100644 --- a/src/meshlabplugins/io_bre/io_bre.h +++ b/src/meshlabplugins/io_bre/io_bre.h @@ -166,8 +166,8 @@ public: void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent= 0); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb); virtual void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterList & par); virtual void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterList &par); void initPreOpenParameter(const QString &formatName, RichParameterList &parlst); diff --git a/src/meshlabplugins/io_collada/io_collada.cpp b/src/meshlabplugins/io_collada/io_collada.cpp index 49866949f..550237a48 100644 --- a/src/meshlabplugins/io_collada/io_collada.cpp +++ b/src/meshlabplugins/io_collada/io_collada.cpp @@ -101,7 +101,7 @@ using namespace std; using namespace vcg; -void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget * /*parent*/) +void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb) { // initializing mask mask = 0; @@ -150,7 +150,7 @@ void ColladaIOPlugin::open(const QString &formatName, const QString &fileName, M } } -void ColladaIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget * /*parent*/) +void ColladaIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/) { if (formatName.toUpper() == tr("DAE")){ QString errorMsgFormat = "Error encountered while exportering file %1:\n%2"; diff --git a/src/meshlabplugins/io_collada/io_collada.h b/src/meshlabplugins/io_collada/io_collada.h index 8b51985fe..79e8fad8f 100644 --- a/src/meshlabplugins/io_collada/io_collada.h +++ b/src/meshlabplugins/io_collada/io_collada.h @@ -62,8 +62,8 @@ class ColladaIOPlugin : public QObject, public IOMeshPlugin std::list exportFormats() const; void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &par, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent= 0); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &par, vcg::CallBackPos *cb); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); }; #endif diff --git a/src/meshlabplugins/io_ctm/io_ctm.cpp b/src/meshlabplugins/io_ctm/io_ctm.cpp index f684249aa..dc9f9ac25 100644 --- a/src/meshlabplugins/io_ctm/io_ctm.cpp +++ b/src/meshlabplugins/io_ctm/io_ctm.cpp @@ -36,7 +36,7 @@ using namespace vcg; -void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & /*par*/, CallBackPos *cb, QWidget * /*parent*/) +void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & /*par*/, CallBackPos *cb) { if (formatName.toUpper() == tr("CTM")){ QString errorMsgFormat = "Error encountered while loading file:\n\"%1\"\n\nError details: %2"; @@ -51,7 +51,7 @@ void IOMPlugin::open(const QString & formatName, const QString &fileName, MeshMo } } -void IOMPlugin::save(const QString & formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos * /*cb*/, QWidget *parent) +void IOMPlugin::save(const QString & formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos * /*cb*/) { if (formatName.toUpper() == tr("CTM")){ bool lossLessFlag = par.getBool("LossLess"); diff --git a/src/meshlabplugins/io_ctm/io_ctm.h b/src/meshlabplugins/io_ctm/io_ctm.h index f7ba61a03..7e8b6b0df 100644 --- a/src/meshlabplugins/io_ctm/io_ctm.h +++ b/src/meshlabplugins/io_ctm/io_ctm.h @@ -48,8 +48,8 @@ public: void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; void initSaveParameter(const QString &/*format*/, MeshModel &/*m*/, RichParameterList & /*par*/); - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask,const RichParameterList & par, vcg::CallBackPos *cb); }; diff --git a/src/meshlabplugins/io_expe/io_expe.cpp b/src/meshlabplugins/io_expe/io_expe.cpp index d58f284b1..4db6f77e0 100644 --- a/src/meshlabplugins/io_expe/io_expe.cpp +++ b/src/meshlabplugins/io_expe/io_expe.cpp @@ -38,7 +38,7 @@ using namespace vcg; -void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*parlst*/, CallBackPos *cb, QWidget*/*parent*/) +void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList & /*parlst*/, CallBackPos *cb) { // initializing mask mask = 0; @@ -102,7 +102,7 @@ void ExpeIOPlugin::open(const QString &formatName, const QString &fileName, Mesh (*cb)(99, "Done"); } -void ExpeIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget *parent) +void ExpeIOPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos * /*cb*/) { QString errorMsgFormat = "Error encountered while exporting file %1:\n%2"; string filename = QFile::encodeName(fileName).constData (); diff --git a/src/meshlabplugins/io_expe/io_expe.h b/src/meshlabplugins/io_expe/io_expe.h index 64b4d56dd..d07f32070 100644 --- a/src/meshlabplugins/io_expe/io_expe.h +++ b/src/meshlabplugins/io_expe/io_expe.h @@ -44,8 +44,8 @@ public: virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; // void initPreOpenParameter(const QString &/*format*/, const QString &/*fileName*/, RichParameterSet & /*par*/); - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); }; #endif diff --git a/src/meshlabplugins/io_json/io_json.cpp b/src/meshlabplugins/io_json/io_json.cpp index 8f6bb92b8..35b35a784 100644 --- a/src/meshlabplugins/io_json/io_json.cpp +++ b/src/meshlabplugins/io_json/io_json.cpp @@ -45,17 +45,14 @@ QString JSONIOPlugin::pluginName() const return "IOJson"; } -void JSONIOPlugin::open(const QString & formatName, const QString &, MeshModel &, int &, const RichParameterList &, vcg::CallBackPos *, QWidget * /*parent*/) +void JSONIOPlugin::open(const QString & formatName, const QString &, MeshModel &, int &, const RichParameterList &, vcg::CallBackPos *) { wrongOpenFormat(formatName); } -void JSONIOPlugin::save(const QString & formatName,const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb, QWidget * parent) +void JSONIOPlugin::save(const QString & formatName,const QString & fileName, MeshModel & m, const int mask, const RichParameterList &, vcg::CallBackPos *) { if (formatName.toUpper() == tr("JSON")){ - (void)par; - (void)cb; - (void)parent; vcg::tri::Allocator::CompactVertexVector(m.cm); vcg::tri::Allocator::CompactFaceVector(m.cm); diff --git a/src/meshlabplugins/io_json/io_json.h b/src/meshlabplugins/io_json/io_json.h index b25b61d87..a8d25ac46 100644 --- a/src/meshlabplugins/io_json/io_json.h +++ b/src/meshlabplugins/io_json/io_json.h @@ -44,8 +44,8 @@ public: void exportMaskCapability(const QString & format, int & capability, int & defaultBits) const; - void open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & par, vcg::CallBackPos * cb = 0, QWidget * parent = 0); - void save(const QString & formatName, const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb = 0, QWidget * parent = 0); + void open(const QString & formatName, const QString & fileName, MeshModel & m, int & mask, const RichParameterList & par, vcg::CallBackPos * cb = 0); + void save(const QString & formatName, const QString & fileName, MeshModel & m, const int mask, const RichParameterList & par, vcg::CallBackPos * cb = 0); }; #endif // JSONIOPLUGIN_H diff --git a/src/meshlabplugins/io_pdb/io_pdb.cpp b/src/meshlabplugins/io_pdb/io_pdb.cpp index 602cb557a..4f06ee45f 100644 --- a/src/meshlabplugins/io_pdb/io_pdb.cpp +++ b/src/meshlabplugins/io_pdb/io_pdb.cpp @@ -64,7 +64,7 @@ void PDBIOPlugin::initPreOpenParameter(const QString &formatName, RichParameterL } } -void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget * /*parent*/) +void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb) { //bool normalsUpdated = false; @@ -93,7 +93,7 @@ void PDBIOPlugin::open(const QString &formatName, const QString &fileName, MeshM } } -void PDBIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos * /*cb*/, QWidget * /*parent*/) +void PDBIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList & /*par*/, CallBackPos * /*cb*/) { wrongSaveFormat(formatName); } diff --git a/src/meshlabplugins/io_pdb/io_pdb.h b/src/meshlabplugins/io_pdb/io_pdb.h index cc2d323a0..51a5acca4 100644 --- a/src/meshlabplugins/io_pdb/io_pdb.h +++ b/src/meshlabplugins/io_pdb/io_pdb.h @@ -42,8 +42,8 @@ public: void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0, QWidget *parent= 0); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask,const RichParameterList & par, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList & par, vcg::CallBackPos *cb=0); virtual void initOpenParameter(const QString &format, MeshModel &/*m*/, RichParameterList & par); virtual void applyOpenParameter(const QString &format, MeshModel &m, const RichParameterList &par); void initPreOpenParameter(const QString &formatName, RichParameterList &parlst); diff --git a/src/meshlabplugins/io_tri/io_tri.cpp b/src/meshlabplugins/io_tri/io_tri.cpp index 393f6e1ef..091ff9787 100755 --- a/src/meshlabplugins/io_tri/io_tri.cpp +++ b/src/meshlabplugins/io_tri/io_tri.cpp @@ -44,7 +44,7 @@ void TriIOPlugin::initPreOpenParameter(const QString &format, RichParameterList } } -void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb, QWidget *) +void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos *cb) { if(formatName.toUpper() == tr("TRI")) { @@ -70,7 +70,7 @@ void TriIOPlugin::open(const QString &formatName, const QString &fileName, MeshM } } -void TriIOPlugin::save(const QString& formatName, const QString &, MeshModel &, const int, const RichParameterList &, vcg::CallBackPos *, QWidget *) +void TriIOPlugin::save(const QString& formatName, const QString &, MeshModel &, const int, const RichParameterList &, vcg::CallBackPos *) { wrongSaveFormat(formatName); } diff --git a/src/meshlabplugins/io_tri/io_tri.h b/src/meshlabplugins/io_tri/io_tri.h index e1de66fe3..af488ca8c 100755 --- a/src/meshlabplugins/io_tri/io_tri.h +++ b/src/meshlabplugins/io_tri/io_tri.h @@ -48,8 +48,8 @@ public: virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/); - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); }; #endif diff --git a/src/meshlabplugins/io_txt/io_txt.cpp b/src/meshlabplugins/io_txt/io_txt.cpp index a148b66e5..e627bd145 100755 --- a/src/meshlabplugins/io_txt/io_txt.cpp +++ b/src/meshlabplugins/io_txt/io_txt.cpp @@ -59,7 +59,7 @@ void TxtIOPlugin::initPreOpenParameter(const QString &format, RichParameterList } } -void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos * /*cb*/, QWidget * /*parent*/) +void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &parlst, CallBackPos * /*cb*/) { if(formatName.toUpper() == tr("TXT")) { int rowToSkip = parlst.getInt("rowToSkip"); @@ -85,7 +85,7 @@ void TxtIOPlugin::open(const QString &formatName, const QString &fileName, MeshM } } -void TxtIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos * /*cb*/, QWidget * /*parent*/) +void TxtIOPlugin::save(const QString & formatName, const QString & /*fileName*/, MeshModel & /*m*/, const int /*mask*/, const RichParameterList &, vcg::CallBackPos * /*cb*/) { wrongSaveFormat(formatName); } diff --git a/src/meshlabplugins/io_txt/io_txt.h b/src/meshlabplugins/io_txt/io_txt.h index 9c0d97f08..5c02f5fdf 100755 --- a/src/meshlabplugins/io_txt/io_txt.h +++ b/src/meshlabplugins/io_txt/io_txt.h @@ -42,8 +42,8 @@ public: virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/); - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); }; #endif diff --git a/src/meshlabplugins/io_u3d/io_u3d.cpp b/src/meshlabplugins/io_u3d/io_u3d.cpp index e5ecd3a5e..2086d5a39 100644 --- a/src/meshlabplugins/io_u3d/io_u3d.cpp +++ b/src/meshlabplugins/io_u3d/io_u3d.cpp @@ -50,8 +50,7 @@ void U3DIOPlugin::open( MeshModel &, int&, const RichParameterList &, - CallBackPos *, - QWidget *) + CallBackPos *) { wrongOpenFormat(format); } @@ -62,8 +61,7 @@ void U3DIOPlugin::save( MeshModel &m, const int mask, const RichParameterList & par, - vcg::CallBackPos *, - QWidget *) + vcg::CallBackPos *) { vcg::tri::Allocator::CompactVertexVector(m.cm); vcg::tri::Allocator::CompactFaceVector(m.cm); diff --git a/src/meshlabplugins/io_u3d/io_u3d.h b/src/meshlabplugins/io_u3d/io_u3d.h index 2d13f5e8d..458a0f104 100644 --- a/src/meshlabplugins/io_u3d/io_u3d.h +++ b/src/meshlabplugins/io_u3d/io_u3d.h @@ -48,8 +48,8 @@ public: virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent= 0); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb=0); void initSaveParameter(const QString &format, MeshModel &/*m*/, RichParameterList &par); diff --git a/src/meshlabplugins/io_x3d/io_x3d.cpp b/src/meshlabplugins/io_x3d/io_x3d.cpp index ef20ebcd2..139bb8f80 100644 --- a/src/meshlabplugins/io_x3d/io_x3d.cpp +++ b/src/meshlabplugins/io_x3d/io_x3d.cpp @@ -31,7 +31,7 @@ using namespace std; using namespace vcg; -void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb, QWidget */*parent*/) +void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, CallBackPos *cb) { // initializing mask mask = 0; @@ -120,7 +120,7 @@ void IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshM } -void IoX3DPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *) +void IoX3DPlugin::save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb) { QString errorMsgFormat = "Error encountered while exportering file:\n%1\n\nError details: %2"; string filename = QFile::encodeName(fileName).constData (); diff --git a/src/meshlabplugins/io_x3d/io_x3d.h b/src/meshlabplugins/io_x3d/io_x3d.h index b53b54c2f..3828d2354 100644 --- a/src/meshlabplugins/io_x3d/io_x3d.h +++ b/src/meshlabplugins/io_x3d/io_x3d.h @@ -51,8 +51,8 @@ public: virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0, QWidget *parent=0); - void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb, QWidget *parent); + void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb=0); + void save(const QString &formatName, const QString &fileName, MeshModel &m, const int mask, const RichParameterList &, vcg::CallBackPos *cb); }; #endif diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp index 5cd0a9023..785de26fb 100644 --- a/src/meshlabserver/mainserver.cpp +++ b/src/meshlabserver/mainserver.cpp @@ -262,7 +262,7 @@ public: int defbits = 0; pCurrentIOPlugin->exportMaskCapability(extension,formatmask,defbits); try { - pCurrentIOPlugin->save(extension, fileName, *mm ,mask & formatmask, savePar); + pCurrentIOPlugin->save(extension, fileName, *mm ,mask & formatmask, savePar, nullptr); QDir::setCurrent(curDir.absolutePath()); return true; }