Commit 87a8ac3a authored by Matthias Möller's avatar Matthias Möller

- replaced deprecated qt4 functions

- removed some unnecessary qt headers

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17078 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bed93511
...@@ -581,27 +581,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType ...@@ -581,27 +581,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType
if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) ) if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) )
{ {
OpenMesh::VPropHandleT< TriMesh::Point > prop; OpenMesh::VPropHandleT< TriMesh::Point > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("double") ) else if ( dtype == tr("double") )
{ {
OpenMesh::VPropHandleT< double > prop; OpenMesh::VPropHandleT< double > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("unsigned int") ) else if ( dtype == tr("unsigned int") )
{ {
OpenMesh::VPropHandleT< unsigned int > prop; OpenMesh::VPropHandleT< unsigned int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("int") ) else if ( dtype == tr("int") )
{ {
OpenMesh::VPropHandleT< int > prop; OpenMesh::VPropHandleT< int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("bool") ) else if ( dtype == tr("bool") )
{ {
OpenMesh::VPropHandleT< bool > prop; OpenMesh::VPropHandleT< bool > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
//please update the doc if you write "skin weights"-property support //please update the doc if you write "skin weights"-property support
...@@ -609,7 +609,7 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType ...@@ -609,7 +609,7 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType
else if ( dtype == tr("SkinWeights") ) else if ( dtype == tr("SkinWeights") )
{ {
OpenMesh::VPropHandleT< BaseSkin::SkinWeights > prop; OpenMesh::VPropHandleT< BaseSkin::SkinWeights > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
#endif #endif
} }
...@@ -618,27 +618,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType ...@@ -618,27 +618,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType
if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) ) if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) )
{ {
OpenMesh::EPropHandleT< TriMesh::Point > prop; OpenMesh::EPropHandleT< TriMesh::Point > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("double") ) else if ( dtype == tr("double") )
{ {
OpenMesh::EPropHandleT< double > prop; OpenMesh::EPropHandleT< double > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("unsgined int") ) else if ( dtype == tr("unsgined int") )
{ {
OpenMesh::EPropHandleT< unsigned int > prop; OpenMesh::EPropHandleT< unsigned int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("int") ) else if ( dtype == tr("int") )
{ {
OpenMesh::EPropHandleT< int > prop; OpenMesh::EPropHandleT< int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("bool") ) else if ( dtype == tr("bool") )
{ {
OpenMesh::EPropHandleT< bool > prop; OpenMesh::EPropHandleT< bool > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
} }
else if ( filter == PropertyInfo::EF_FACE ) else if ( filter == PropertyInfo::EF_FACE )
...@@ -646,27 +646,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType ...@@ -646,27 +646,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType
if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) ) if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) )
{ {
OpenMesh::FPropHandleT< TriMesh::Point > prop; OpenMesh::FPropHandleT< TriMesh::Point > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("double") ) else if ( dtype == tr("double") )
{ {
OpenMesh::FPropHandleT< double > prop; OpenMesh::FPropHandleT< double > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("unsigned int") ) else if ( dtype == tr("unsigned int") )
{ {
OpenMesh::FPropHandleT< unsigned int > prop; OpenMesh::FPropHandleT< unsigned int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("int") ) else if ( dtype == tr("int") )
{ {
OpenMesh::FPropHandleT< int > prop; OpenMesh::FPropHandleT< int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("bool") ) else if ( dtype == tr("bool") )
{ {
OpenMesh::FPropHandleT< bool > prop; OpenMesh::FPropHandleT< bool > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
} }
else if ( filter == PropertyInfo::EF_HALFEDGE ) else if ( filter == PropertyInfo::EF_HALFEDGE )
...@@ -674,27 +674,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType ...@@ -674,27 +674,27 @@ void OMPropertyModel<MeshT>:: addProperty(QString propName, QString friendlyType
if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) ) if ( (dtype == tr("Vec3d")) || (dtype == tr("Vec3f")) )
{ {
OpenMesh::HPropHandleT< TriMesh::Point > prop; OpenMesh::HPropHandleT< TriMesh::Point > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("double") ) else if ( dtype == tr("double") )
{ {
OpenMesh::HPropHandleT< double > prop; OpenMesh::HPropHandleT< double > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("unsigned int") ) else if ( dtype == tr("unsigned int") )
{ {
OpenMesh::HPropHandleT< unsigned int > prop; OpenMesh::HPropHandleT< unsigned int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("int") ) else if ( dtype == tr("int") )
{ {
OpenMesh::HPropHandleT< int > prop; OpenMesh::HPropHandleT< int > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
else if ( dtype == tr("bool") ) else if ( dtype == tr("bool") )
{ {
OpenMesh::HPropHandleT< bool > prop; OpenMesh::HPropHandleT< bool > prop;
mesh->add_property(prop, pname.toAscii().data()); mesh->add_property(prop, pname.toStdString());
} }
} }
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <Qt> #include <Qt>
#include <QtGui>
#include <QSpacerItem> #include <QSpacerItem>
#include <QFileDialog> #include <QFileDialog>
......
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