Commit 689ef2a8 authored by Jan Möbius's avatar Jan Möbius

cppcheck fixes

parent cb367312
...@@ -93,7 +93,9 @@ FileOFFPlugin::FileOFFPlugin() ...@@ -93,7 +93,9 @@ FileOFFPlugin::FileOFFPlugin()
userWriteOptions_(0), userWriteOptions_(0),
forceTriangleMesh_(false), forceTriangleMesh_(false),
forcePolyMesh_(false), forcePolyMesh_(false),
readColorComp_(false) { readColorComp_(false),
trimeshOptions_(OFFImporter::NONE)
{
} }
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
...@@ -534,9 +536,9 @@ bool FileOFFPlugin::readOFFFile(QString _filename, OFFImporter& _importer) { ...@@ -534,9 +536,9 @@ bool FileOFFPlugin::readOFFFile(QString _filename, OFFImporter& _importer) {
// Create message box // Create message box
QMetaObject::invokeMethod(this,"handleTrimeshDialog",Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(this,"handleTrimeshDialog",Qt::BlockingQueuedConnection);
if (trimeshOptions == OFFImporter::TRIMESH) if (trimeshOptions_ == OFFImporter::TRIMESH)
type = DATA_TRIANGLE_MESH; type = DATA_TRIANGLE_MESH;
else if (trimeshOptions == OFFImporter::POLYMESH) else if (trimeshOptions_ == OFFImporter::POLYMESH)
type = DATA_POLY_MESH; type = DATA_POLY_MESH;
else else
type = _importer.isTriangleMesh() ? DATA_TRIANGLE_MESH : DATA_POLY_MESH; type = _importer.isTriangleMesh() ? DATA_TRIANGLE_MESH : DATA_POLY_MESH;
...@@ -579,9 +581,9 @@ void FileOFFPlugin::handleTrimeshDialog() ...@@ -579,9 +581,9 @@ void FileOFFPlugin::handleTrimeshDialog()
if (msgBox.clickedButton() == triButton) if (msgBox.clickedButton() == triButton)
trimeshOptions = OFFImporter::TRIMESH ; trimeshOptions_ = OFFImporter::TRIMESH ;
else if (msgBox.clickedButton() == polyButton) else if (msgBox.clickedButton() == polyButton)
trimeshOptions = OFFImporter::POLYMESH ; trimeshOptions_ = OFFImporter::POLYMESH ;
} }
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
......
...@@ -269,7 +269,7 @@ class FileOFFPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte ...@@ -269,7 +269,7 @@ class FileOFFPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte
bool forceTriangleMesh_; bool forceTriangleMesh_;
bool forcePolyMesh_; bool forcePolyMesh_;
bool readColorComp_; bool readColorComp_;
OFFImporter::ObjectOptionsE trimeshOptions; OFFImporter::ObjectOptionsE trimeshOptions_;
}; };
#if defined(INCLUDE_TEMPLATES) && !defined(FILEOFFPLUGIN_C) #if defined(INCLUDE_TEMPLATES) && !defined(FILEOFFPLUGIN_C)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment