Commit 17c326dd authored by Jan Möbius's avatar Jan Möbius

cppcheck fixes

parent 0c8ebff5
......@@ -85,7 +85,8 @@ FileOMPlugin::FileOMPlugin() :
loadVertexColor_(0),
loadFaceColor_(0),
loadFaceNormal_(0),
loadDefaultButton_(0)
loadDefaultButton_(0),
trimeshOptions_(0)
{
}
......@@ -189,8 +190,8 @@ int FileOMPlugin::loadObject(QString _filename) {
// Note: If in non-gui mode, we will never enter this case branch
QMetaObject::invokeMethod(this,"handleTrimeshDialog",Qt::BlockingQueuedConnection);
if ((trimeshOptions == TYPEPOLY) ||
(trimeshOptions == TYPEASK && !triMesh)) {
if ((trimeshOptions_ == TYPEPOLY) ||
(trimeshOptions_ == TYPEASK && !triMesh)) {
PolyMeshObject* object(0);
if(PluginFunctions::getObject( objectId, object )) {
......@@ -256,11 +257,11 @@ void FileOMPlugin::handleTrimeshDialog()
if (msgBox.clickedButton() == triButton)
trimeshOptions = TYPETRIANGLE ;
trimeshOptions_ = TYPETRIANGLE ;
else if (msgBox.clickedButton() == polyButton)
trimeshOptions = TYPEPOLY ;
trimeshOptions_ = TYPEPOLY ;
else
trimeshOptions = TYPEASK;
trimeshOptions_ = TYPEASK;
}
//-----------------------------------------------------------------------------------------------------
......
......@@ -169,7 +169,7 @@ class FileOMPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInter
QCheckBox* loadFaceColor_;
QCheckBox* loadFaceNormal_;
QPushButton* loadDefaultButton_;
int trimeshOptions;
int trimeshOptions_;
};
#endif //FILEOMPLUGIN_HH
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