From f1eea18df3544aedcb3cd45d0d609eebddb15c57 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 3 Dec 2019 16:46:28 -0600 Subject: [PATCH] common: Some clang-tidy --- src/common/filterparameter.cpp | 158 ++++++++++++++++---------------- src/common/filterparameter.h | 159 ++++++++++++++++----------------- src/common/meshmodel.cpp | 52 ++++++----- src/common/meshmodel.h | 10 +-- src/common/pluginmanager.cpp | 2 +- src/common/pluginmanager.h | 2 +- 6 files changed, 190 insertions(+), 193 deletions(-) diff --git a/src/common/filterparameter.cpp b/src/common/filterparameter.cpp index 40b6050e7..2b7e20817 100644 --- a/src/common/filterparameter.cpp +++ b/src/common/filterparameter.cpp @@ -35,7 +35,7 @@ using namespace vcg; // Very similar to the findParameter but this one does not print out debugstuff. -bool RichParameterSet::hasParameter(QString name) const +bool RichParameterSet::hasParameter(const QString& name) const { QList::const_iterator fpli; for(fpli=paramList.begin();fpli!=paramList.end();++fpli) @@ -46,7 +46,7 @@ bool RichParameterSet::hasParameter(QString name) const return false; } // You should never use this one to know if a given parameter is present. -RichParameter* RichParameterSet::findParameter(QString name) const +RichParameter* RichParameterSet::findParameter(const QString& name) const { QList::const_iterator fpli; for(fpli=paramList.begin();fpli!=paramList.end();++fpli) @@ -60,7 +60,7 @@ RichParameter* RichParameterSet::findParameter(QString name) const return 0; } -RichParameterSet& RichParameterSet::removeParameter(QString name){ +RichParameterSet& RichParameterSet::removeParameter(const QString& name){ paramList.removeAll(findParameter(name)); return (*this); } @@ -75,29 +75,29 @@ RichParameterSet& RichParameterSet::addParam(RichParameter* pd ) //-------------------------------------- -void RichParameterSet::setValue(QString name,const Value& newval){ findParameter(name)->val->set(newval); } +void RichParameterSet::setValue(const QString& name,const Value& newval){ findParameter(name)->val->set(newval); } //- All the get are very similar. Nothing interesting here. - bool RichParameterSet::getBool(QString name) const { return findParameter(name)->val->getBool(); } - int RichParameterSet::getInt(QString name) const { return findParameter(name)->val->getInt();} - float RichParameterSet::getFloat(QString name) const { return findParameter(name)->val->getFloat();} - QColor RichParameterSet::getColor(QString name) const { return findParameter(name)->val->getColor();} - Color4b RichParameterSet::getColor4b(QString name) const { return ColorConverter::ToColor4b(findParameter(name)->val->getColor());} - QString RichParameterSet::getString(QString name) const { return findParameter(name)->val->getString();} - Matrix44f RichParameterSet::getMatrix44(QString name) const { return findParameter(name)->val->getMatrix44f();} - Matrix44 RichParameterSet::getMatrix44m(QString name) const { return Matrix44::Construct(findParameter(name)->val->getMatrix44f());} - Point3f RichParameterSet::getPoint3f(QString name) const { return findParameter(name)->val->getPoint3f();} - Point3 RichParameterSet::getPoint3m(QString name) const { return Point3::Construct(findParameter(name)->val->getPoint3f());} - Shotf RichParameterSet::getShotf(QString name) const { return findParameter(name)->val->getShotf();} - Shot RichParameterSet::getShotm(QString name) const { return Shot::Construct(findParameter(name)->val->getShotf());} - float RichParameterSet::getAbsPerc(QString name) const { return findParameter(name)->val->getAbsPerc();} - int RichParameterSet::getEnum(QString name) const { return findParameter(name)->val->getEnum();} -QList RichParameterSet::getFloatList(QString name) const { return findParameter(name)->val->getFloatList();} - MeshModel * RichParameterSet::getMesh(QString name) const { return findParameter(name)->val->getMesh();} - float RichParameterSet::getDynamicFloat(QString name) const { return findParameter(name)->val->getDynamicFloat();} - QString RichParameterSet::getOpenFileName(QString name) const { return findParameter(name)->val->getFileName();} - QString RichParameterSet::getSaveFileName(QString name) const { return findParameter(name)->val->getFileName(); } + bool RichParameterSet::getBool(const QString& name) const { return findParameter(name)->val->getBool(); } + int RichParameterSet::getInt(const QString& name) const { return findParameter(name)->val->getInt();} + float RichParameterSet::getFloat(const QString& name) const { return findParameter(name)->val->getFloat();} + QColor RichParameterSet::getColor(const QString& name) const { return findParameter(name)->val->getColor();} + Color4b RichParameterSet::getColor4b(const QString& name) const { return ColorConverter::ToColor4b(findParameter(name)->val->getColor());} + QString RichParameterSet::getString(const QString& name) const { return findParameter(name)->val->getString();} + Matrix44f RichParameterSet::getMatrix44(const QString& name) const { return findParameter(name)->val->getMatrix44f();} + Matrix44 RichParameterSet::getMatrix44m(const QString& name) const { return Matrix44::Construct(findParameter(name)->val->getMatrix44f());} + Point3f RichParameterSet::getPoint3f(const QString& name) const { return findParameter(name)->val->getPoint3f();} + Point3 RichParameterSet::getPoint3m(const QString& name) const { return Point3::Construct(findParameter(name)->val->getPoint3f());} + Shotf RichParameterSet::getShotf(const QString& name) const { return findParameter(name)->val->getShotf();} + Shot RichParameterSet::getShotm(const QString& name) const { return Shot::Construct(findParameter(name)->val->getShotf());} + float RichParameterSet::getAbsPerc(const QString& name) const { return findParameter(name)->val->getAbsPerc();} + int RichParameterSet::getEnum(const QString& name) const { return findParameter(name)->val->getEnum();} +QList RichParameterSet::getFloatList(const QString& name) const { return findParameter(name)->val->getFloatList();} + MeshModel * RichParameterSet::getMesh(const QString& name) const { return findParameter(name)->val->getMesh();} + float RichParameterSet::getDynamicFloat(const QString& name) const { return findParameter(name)->val->getDynamicFloat();} + QString RichParameterSet::getOpenFileName(const QString& name) const { return findParameter(name)->val->getFileName();} + QString RichParameterSet::getSaveFileName(const QString& name) const { return findParameter(name)->val->getFileName(); } RichParameterSet& RichParameterSet::operator=( const RichParameterSet& rps ) { @@ -159,7 +159,7 @@ RichParameterSet::RichParameterSet( const RichParameterSet& rps ) } } -RichParameterSet::RichParameterSet() :paramList() +RichParameterSet::RichParameterSet() { } @@ -628,7 +628,7 @@ BoolValue::BoolValue( const bool val ) : pval(val) } -ParameterDecoration::ParameterDecoration( Value* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :fieldDesc(desc),tooltip(tltip),defVal(defvalue) +ParameterDecoration::ParameterDecoration( Value* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :fieldDesc(desc),tooltip(tltip),defVal(defvalue) { } @@ -638,71 +638,71 @@ ParameterDecoration::~ParameterDecoration() delete defVal; } -BoolDecoration::BoolDecoration( BoolValue* defvalue,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +BoolDecoration::BoolDecoration( BoolValue* defvalue,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -IntDecoration::IntDecoration( IntValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +IntDecoration::IntDecoration( IntValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -FloatDecoration::FloatDecoration( FloatValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +FloatDecoration::FloatDecoration( FloatValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -StringDecoration::StringDecoration( StringValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +StringDecoration::StringDecoration( StringValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -Matrix44fDecoration::Matrix44fDecoration( Matrix44fValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +Matrix44fDecoration::Matrix44fDecoration( Matrix44fValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -Point3fDecoration::Point3fDecoration( Point3fValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +Point3fDecoration::Point3fDecoration( Point3fValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -ShotfDecoration::ShotfDecoration( ShotfValue* defvalue,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +ShotfDecoration::ShotfDecoration( ShotfValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -ColorDecoration::ColorDecoration( ColorValue* defvalue,const QString desc /*= QString()*/,const QString tltip/*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) +ColorDecoration::ColorDecoration( ColorValue* defvalue,const QString& desc /*= QString()*/,const QString& tltip/*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip) { } -AbsPercDecoration::AbsPercDecoration( AbsPercValue* defvalue,const float minVal,const float maxVal,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),min(minVal),max(maxVal) +AbsPercDecoration::AbsPercDecoration( AbsPercValue* defvalue,const float minVal,const float maxVal,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),min(minVal),max(maxVal) { } -EnumDecoration::EnumDecoration( EnumValue* defvalue, QStringList values,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),enumvalues(values) +EnumDecoration::EnumDecoration( EnumValue* defvalue, QStringList values,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),enumvalues(std::move(values)) { } -DynamicFloatDecoration::DynamicFloatDecoration( DynamicFloatValue* defvalue, const float minVal,const float maxVal,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),min(minVal),max(maxVal) +DynamicFloatDecoration::DynamicFloatDecoration( DynamicFloatValue* defvalue, const float minVal,const float maxVal,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),min(minVal),max(maxVal) { } -SaveFileDecoration::SaveFileDecoration( FileValue* defvalue,const QString extension/*=QString(".*")*/,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),ext(extension) +SaveFileDecoration::SaveFileDecoration( FileValue* defvalue,const QString& extension/*=QString(".*")*/,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),ext(extension) { } -OpenFileDecoration::OpenFileDecoration( FileValue* directorydefvalue,const QStringList extensions,const QString desc /*= QString()*/,const QString tltip /*= QString()*/ ) :ParameterDecoration(directorydefvalue,desc,tltip),exts(extensions) +OpenFileDecoration::OpenFileDecoration( FileValue* directorydefvalue,const QStringList& extensions,const QString& desc /*= QString()*/,const QString& tltip /*= QString()*/ ) :ParameterDecoration(directorydefvalue,desc,tltip),exts(extensions) { } -MeshDecoration::MeshDecoration( MeshValue* defvalue,MeshDocument* doc,const QString desc/*=QString()*/, const QString tltip/*=QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),meshdoc(doc) +MeshDecoration::MeshDecoration( MeshValue* defvalue,MeshDocument* doc,const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/ ) :ParameterDecoration(defvalue,desc,tltip),meshdoc(doc) { meshindex = -1; if (doc != NULL) @@ -710,7 +710,7 @@ MeshDecoration::MeshDecoration( MeshValue* defvalue,MeshDocument* doc,const QStr assert((meshindex != -1) || (doc == NULL)); } -MeshDecoration::MeshDecoration( int meshind,MeshDocument* doc,const QString desc/*=QString()*/, const QString tltip/*=QString()*/ ) :ParameterDecoration(NULL,desc,tltip),meshdoc(doc) +MeshDecoration::MeshDecoration( int meshind,MeshDocument* doc,const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/ ) :ParameterDecoration(NULL,desc,tltip),meshdoc(doc) { assert(meshind < doc->size() && meshind >= 0); meshindex = meshind; @@ -718,12 +718,12 @@ MeshDecoration::MeshDecoration( int meshind,MeshDocument* doc,const QString desc defVal = new MeshValue(doc->meshList.at(meshind)); } -MeshDecoration::MeshDecoration( int meshind,const QString desc/*=QString()*/,const QString tooltip/*=QString()*/) :ParameterDecoration(NULL,desc,tooltip),meshdoc(NULL),meshindex(meshind) +MeshDecoration::MeshDecoration( int meshind,const QString& desc/*=QString()*/,const QString& tooltip/*=QString()*/) :ParameterDecoration(NULL,desc,tooltip),meshdoc(NULL),meshindex(meshind) { } -RichParameter::RichParameter(const QString nm, Value* v, ParameterDecoration* prdec, bool isxmlpar) : name(nm), val(v), pd(prdec), isxmlparam(isxmlpar) +RichParameter::RichParameter(const QString& nm, Value* v, ParameterDecoration* prdec, bool isxmlpar) : name(nm), val(v), pd(prdec), isxmlparam(isxmlpar) { } @@ -742,11 +742,11 @@ RichBool::RichBool( const QString nm,const bool defval,const QString desc) : Ric } */ -RichBool::RichBool( const QString nm,const bool defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) : RichParameter(nm,new BoolValue(defval),new BoolDecoration(new BoolValue(defval),desc,tltip)) +RichBool::RichBool( const QString& nm,const bool defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) : RichParameter(nm,new BoolValue(defval),new BoolDecoration(new BoolValue(defval),desc,tltip)) {} -RichBool::RichBool(const QString nm, const bool val, const bool defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new BoolValue(val), new BoolDecoration(new BoolValue(defval), desc, tltip), isxmlpar) +RichBool::RichBool(const QString& nm, const bool val, const bool defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new BoolValue(val), new BoolDecoration(new BoolValue(defval), desc, tltip), isxmlpar) {} void RichBool::accept( Visitor& v ) @@ -764,12 +764,12 @@ RichBool::~RichBool() } -RichInt::RichInt( const QString nm,const int defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new IntValue(defval),new IntDecoration(new IntValue(defval),desc,tltip)) +RichInt::RichInt( const QString& nm,const int defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new IntValue(defval),new IntDecoration(new IntValue(defval),desc,tltip)) { } -RichInt::RichInt(const QString nm, const int val, const int defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new IntValue(val), new IntDecoration(new IntValue(defval), desc, tltip), isxmlpar) +RichInt::RichInt(const QString& nm, const int val, const int defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new IntValue(val), new IntDecoration(new IntValue(defval), desc, tltip), isxmlpar) { } @@ -789,12 +789,12 @@ RichInt::~RichInt() } -RichFloat::RichFloat( const QString nm,const float defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new FloatValue(defval),new FloatDecoration(new FloatValue(defval),desc,tltip)) +RichFloat::RichFloat( const QString& nm,const float defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new FloatValue(defval),new FloatDecoration(new FloatValue(defval),desc,tltip)) { } -RichFloat::RichFloat(const QString nm, const float val, const float defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new FloatValue(val), new FloatDecoration(new FloatValue(defval), desc, tltip), isxmlpar) +RichFloat::RichFloat(const QString& nm, const float val, const float defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new FloatValue(val), new FloatDecoration(new FloatValue(defval), desc, tltip), isxmlpar) { } @@ -814,22 +814,22 @@ RichFloat::~RichFloat() } -RichString::RichString( const QString nm,const QString defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),desc,tltip)) +RichString::RichString( const QString& nm,const QString& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),desc,tltip)) { } -RichString::RichString(const QString nm, const QString val, const QString defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new StringValue(val), new StringDecoration(new StringValue(defval), desc, tltip), isxmlpar) +RichString::RichString(const QString& nm, const QString& val, const QString& defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new StringValue(val), new StringDecoration(new StringValue(defval), desc, tltip), isxmlpar) { } -RichString::RichString( const QString nm,const QString defval ) : RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),"","")) +RichString::RichString( const QString& nm,const QString& defval ) : RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),"","")) { } -RichString::RichString( const QString nm,const QString defval,const QString desc ) : RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),desc,"")) +RichString::RichString( const QString& nm,const QString& defval,const QString& desc ) : RichParameter(nm,new StringValue(defval),new StringDecoration(new StringValue(defval),desc,"")) { } @@ -849,10 +849,10 @@ RichString::~RichString() } -RichMatrix44f::RichMatrix44f( const QString nm,const vcg::Matrix44f& defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new Matrix44fValue(defval),new Matrix44fDecoration(new Matrix44fValue(defval),desc,tltip)) { } -RichMatrix44f::RichMatrix44f( const QString nm,const vcg::Matrix44d& defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new Matrix44fValue(defval),new Matrix44fDecoration(new Matrix44fValue(defval),desc,tltip)) { } +RichMatrix44f::RichMatrix44f( const QString& nm,const vcg::Matrix44f& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new Matrix44fValue(defval),new Matrix44fDecoration(new Matrix44fValue(defval),desc,tltip)) { } +RichMatrix44f::RichMatrix44f( const QString& nm,const vcg::Matrix44d& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new Matrix44fValue(defval),new Matrix44fDecoration(new Matrix44fValue(defval),desc,tltip)) { } -RichMatrix44f::RichMatrix44f(const QString nm, const vcg::Matrix44f& val, const vcg::Matrix44f& defval, const QString desc /*= QString()*/, const QString tltip /*= QString()*/, bool /*isxmlpar = false*/) +RichMatrix44f::RichMatrix44f(const QString& nm, const vcg::Matrix44f& val, const vcg::Matrix44f& defval, const QString& desc /*= QString()*/, const QString& tltip /*= QString()*/, bool /*isxmlpar = false*/) : RichParameter(nm, new Matrix44fValue(val), new Matrix44fDecoration(new Matrix44fValue(defval), desc, tltip)) { } void RichMatrix44f::accept( Visitor& v ) @@ -870,10 +870,10 @@ RichMatrix44f::~RichMatrix44f() } -RichPoint3f::RichPoint3f( const QString nm,const vcg::Point3f defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new Point3fValue(defval),new Point3fDecoration(new Point3fValue(defval),desc,tltip)){} -RichPoint3f::RichPoint3f( const QString nm,const vcg::Point3d defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new Point3fValue(defval),new Point3fDecoration(new Point3fValue(defval),desc,tltip)){} +RichPoint3f::RichPoint3f( const QString& nm,const vcg::Point3f& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new Point3fValue(defval),new Point3fDecoration(new Point3fValue(defval),desc,tltip)){} +RichPoint3f::RichPoint3f( const QString& nm,const vcg::Point3d& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new Point3fValue(defval),new Point3fDecoration(new Point3fValue(defval),desc,tltip)){} -RichPoint3f::RichPoint3f(const QString nm, const vcg::Point3f val, const vcg::Point3f defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new Point3fValue(val), new Point3fDecoration(new Point3fValue(defval), desc, tltip), isxmlpar) +RichPoint3f::RichPoint3f(const QString& nm, const vcg::Point3f& val, const vcg::Point3f& defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new Point3fValue(val), new Point3fDecoration(new Point3fValue(defval), desc, tltip), isxmlpar) { } @@ -893,10 +893,10 @@ RichPoint3f::~RichPoint3f() } //---- -RichShotf::RichShotf( const QString nm,const vcg::Shotf defval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new ShotfValue(defval),new ShotfDecoration(new ShotfValue(defval),desc,tltip)) +RichShotf::RichShotf( const QString& nm,const vcg::Shotf& defval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new ShotfValue(defval),new ShotfDecoration(new ShotfValue(defval),desc,tltip)) {} -RichShotf::RichShotf(const QString nm, const vcg::Shotf val, const vcg::Shotf defval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new ShotfValue(val), new ShotfDecoration(new ShotfValue(defval), desc, tltip), isxmlpar) +RichShotf::RichShotf(const QString& nm, const vcg::Shotf& val, const vcg::Shotf& defval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new ShotfValue(val), new ShotfDecoration(new ShotfValue(defval), desc, tltip), isxmlpar) {} void RichShotf::accept( Visitor& v ) @@ -912,23 +912,23 @@ bool RichShotf::operator==( const RichParameter& rb ) RichShotf::~RichShotf() { } //---- -RichColor::RichColor( const QString nm,const QColor defval,const QString desc,const QString tltip ) :RichParameter(nm,new ColorValue(defval),new ColorDecoration(new ColorValue(defval),desc,tltip)) +RichColor::RichColor( const QString& nm,const QColor& defval,const QString& desc,const QString& tltip ) :RichParameter(nm,new ColorValue(defval),new ColorDecoration(new ColorValue(defval),desc,tltip)) { } -RichColor::RichColor(const QString nm, const QColor val, const QColor defval, const QString desc, const QString tltip, bool isxmlpar) : RichParameter(nm, new ColorValue(val), new ColorDecoration(new ColorValue(defval), desc, tltip), isxmlpar) +RichColor::RichColor(const QString& nm, const QColor& val, const QColor& defval, const QString& desc, const QString& tltip, bool isxmlpar) : RichParameter(nm, new ColorValue(val), new ColorDecoration(new ColorValue(defval), desc, tltip), isxmlpar) { } -RichColor::RichColor( const QString nm,const QColor defval ) +RichColor::RichColor( const QString& nm,const QColor& defval ) :RichParameter(nm,new ColorValue(defval),new ColorDecoration(new ColorValue(defval),"","")) { } -RichColor::RichColor( const QString nm,const QColor defval,const QString desc ) +RichColor::RichColor( const QString& nm,const QColor& defval,const QString& desc ) :RichParameter(nm,new ColorValue(defval),new ColorDecoration(new ColorValue(defval),desc,"")) { } @@ -948,12 +948,12 @@ RichColor::~RichColor() } -RichAbsPerc::RichAbsPerc( const QString nm,const float defval,const float minval,const float maxval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm, new AbsPercValue(defval), new AbsPercDecoration(new AbsPercValue(defval),minval,maxval,desc,tltip)) +RichAbsPerc::RichAbsPerc( const QString& nm,const float defval,const float minval,const float maxval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm, new AbsPercValue(defval), new AbsPercDecoration(new AbsPercValue(defval),minval,maxval,desc,tltip)) { } -RichAbsPerc::RichAbsPerc(const QString nm, const float val, const float defval, const float minval, const float maxval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new AbsPercValue(val), new AbsPercDecoration(new AbsPercValue(defval), minval, maxval, desc, tltip), isxmlpar) +RichAbsPerc::RichAbsPerc(const QString& nm, const float val, const float defval, const float minval, const float maxval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new AbsPercValue(val), new AbsPercDecoration(new AbsPercValue(defval), minval, maxval, desc, tltip), isxmlpar) { } @@ -973,12 +973,12 @@ RichAbsPerc::~RichAbsPerc() } -RichEnum::RichEnum( const QString nm,const int defval,const QStringList values,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new EnumValue(defval),new EnumDecoration(new EnumValue(defval),values,desc,tltip)) +RichEnum::RichEnum( const QString& nm,const int defval,const QStringList& values,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new EnumValue(defval),new EnumDecoration(new EnumValue(defval),values,desc,tltip)) { } -RichEnum::RichEnum(const QString nm, const int val, const int defval, const QStringList values, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new EnumValue(val), new EnumDecoration(new EnumValue(defval), values, desc, tltip), isxmlpar) +RichEnum::RichEnum(const QString& nm, const int val, const int defval, const QStringList& values, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new EnumValue(val), new EnumDecoration(new EnumValue(defval), values, desc, tltip), isxmlpar) { } @@ -998,7 +998,7 @@ RichEnum::~RichEnum() } -RichMesh::RichMesh( const QString nm,MeshModel* defval,MeshDocument* doc,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) +RichMesh::RichMesh( const QString& nm,MeshModel* defval,MeshDocument* doc,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm, new MeshValue(defval),new MeshDecoration( new MeshValue(defval),doc,desc,tltip)) { meshindex = -1; @@ -1007,7 +1007,7 @@ RichMesh::RichMesh( const QString nm,MeshModel* defval,MeshDocument* doc,const Q assert((meshindex != -1) || (doc == NULL)); } -RichMesh::RichMesh( const QString nm,int meshind,MeshDocument* doc,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) +RichMesh::RichMesh( const QString& nm,int meshind,MeshDocument* doc,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,NULL, new MeshDecoration(meshind,doc,desc,tltip)) { assert(meshind < doc->size() && meshind >= 0); @@ -1018,13 +1018,13 @@ RichMesh::RichMesh( const QString nm,int meshind,MeshDocument* doc,const QString val = NULL; } -RichMesh::RichMesh(const QString nm, int meshind, bool isxmlpar /*= false*/) +RichMesh::RichMesh(const QString& nm, int meshind, bool isxmlpar /*= false*/) : RichParameter(nm, new MeshValue(NULL), new MeshDecoration(meshind), isxmlpar) { meshindex = meshind; } -RichMesh::RichMesh(const QString nm, MeshModel* val, MeshModel* defval, MeshDocument* doc, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) +RichMesh::RichMesh(const QString& nm, MeshModel* val, MeshModel* defval, MeshDocument* doc, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new MeshValue(val), new MeshDecoration(new MeshValue(defval), doc, desc, tltip), isxmlpar) { meshindex = -1; @@ -1032,7 +1032,7 @@ RichMesh::RichMesh(const QString nm, MeshModel* val, MeshModel* defval, MeshDocu meshindex = doc->meshList.indexOf(val); } -RichMesh::RichMesh(const QString nm, int meshind, const QString desc /*= QString()*/, const QString tltip /*= QString()*/, bool isxmlpar /*= false*/) +RichMesh::RichMesh(const QString& nm, int meshind, const QString& desc /*= QString()*/, const QString& tltip /*= QString()*/, bool isxmlpar /*= false*/) : RichParameter(nm, new MeshValue(NULL), new MeshDecoration(meshind, desc, tltip), isxmlpar) { meshindex = meshind; @@ -1053,12 +1053,12 @@ RichMesh::~RichMesh() } -RichFloatList::RichFloatList( const QString nm,FloatListValue* v,FloatListDecoration* prdec ) :RichParameter(nm,v,prdec) +RichFloatList::RichFloatList( const QString& nm,FloatListValue* v,FloatListDecoration* prdec ) :RichParameter(nm,v,prdec) { } -RichFloatList::RichFloatList(const QString nm, FloatListValue* /*val*/, FloatListValue* v, FloatListDecoration* prdec, bool isxmlpar) : RichParameter(nm, v, prdec, isxmlpar) +RichFloatList::RichFloatList(const QString& nm, FloatListValue* /*val*/, FloatListValue* v, FloatListDecoration* prdec, bool isxmlpar) : RichParameter(nm, v, prdec, isxmlpar) { } @@ -1078,12 +1078,12 @@ RichFloatList::~RichFloatList() } -RichDynamicFloat::RichDynamicFloat( const QString nm,const float defval,const float minval,const float maxval,const QString desc/*=QString()*/,const QString tltip/*=QString()*/ ) :RichParameter(nm,new DynamicFloatValue(defval),new DynamicFloatDecoration(new DynamicFloatValue(defval),minval,maxval,desc,tltip)) +RichDynamicFloat::RichDynamicFloat( const QString& nm,const float defval,const float minval,const float maxval,const QString& desc/*=QString()*/,const QString& tltip/*=QString()*/ ) :RichParameter(nm,new DynamicFloatValue(defval),new DynamicFloatDecoration(new DynamicFloatValue(defval),minval,maxval,desc,tltip)) { } -RichDynamicFloat::RichDynamicFloat(const QString nm, const float val, const float defval, const float minval, const float maxval, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new DynamicFloatValue(val), new DynamicFloatDecoration(new DynamicFloatValue(defval), minval, maxval, desc, tltip), isxmlpar) +RichDynamicFloat::RichDynamicFloat(const QString& nm, const float val, const float defval, const float minval, const float maxval, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) : RichParameter(nm, new DynamicFloatValue(val), new DynamicFloatDecoration(new DynamicFloatValue(defval), minval, maxval, desc, tltip), isxmlpar) { } @@ -1103,7 +1103,7 @@ RichDynamicFloat::~RichDynamicFloat() } -RichOpenFile::RichOpenFile(const QString nm, const QString directorydefval, const QStringList exts /*= QString("*.*")*/, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) :RichParameter(nm, new FileValue(directorydefval), new OpenFileDecoration(new FileValue(directorydefval), exts, desc, tltip), isxmlpar) +RichOpenFile::RichOpenFile(const QString& nm, const QString& directorydefval, const QStringList& exts /*= QString("*.*")*/, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) :RichParameter(nm, new FileValue(directorydefval), new OpenFileDecoration(new FileValue(directorydefval), exts, desc, tltip), isxmlpar) { } @@ -1122,7 +1122,7 @@ RichOpenFile::~RichOpenFile() } -RichSaveFile::RichSaveFile(const QString nm, const QString filedefval, const QString ext, const QString desc/*=QString()*/, const QString tltip/*=QString()*/, bool isxmlpar) :RichParameter(nm, new FileValue(filedefval), new SaveFileDecoration(new FileValue(filedefval), ext, desc, tltip), isxmlpar) +RichSaveFile::RichSaveFile(const QString& nm, const QString& filedefval, const QString& ext, const QString& desc/*=QString()*/, const QString& tltip/*=QString()*/, bool isxmlpar) :RichParameter(nm, new FileValue(filedefval), new SaveFileDecoration(new FileValue(filedefval), ext, desc, tltip), isxmlpar) { } diff --git a/src/common/filterparameter.h b/src/common/filterparameter.h index c48c4efa1..4bc43aa3f 100644 --- a/src/common/filterparameter.h +++ b/src/common/filterparameter.h @@ -332,7 +332,7 @@ public: QString tooltip; Value* defVal; - ParameterDecoration(Value* defvalue, const QString desc = QString(), const QString tltip = QString()); + ParameterDecoration(Value* defvalue, const QString& desc = QString(), const QString& tltip = QString()); virtual ~ParameterDecoration(); @@ -341,63 +341,63 @@ public: class BoolDecoration : public ParameterDecoration { public: - BoolDecoration(BoolValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + BoolDecoration(BoolValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~BoolDecoration() {} }; class IntDecoration : public ParameterDecoration { public: - IntDecoration(IntValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + IntDecoration(IntValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~IntDecoration() {} }; class FloatDecoration : public ParameterDecoration { public: - FloatDecoration(FloatValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + FloatDecoration(FloatValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~FloatDecoration() {} }; class StringDecoration : public ParameterDecoration { public: - StringDecoration(StringValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + StringDecoration(StringValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~StringDecoration() {} }; class Matrix44fDecoration : public ParameterDecoration { public: - Matrix44fDecoration(Matrix44fValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + Matrix44fDecoration(Matrix44fValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~Matrix44fDecoration() {} }; class Point3fDecoration : public ParameterDecoration { public: - Point3fDecoration(Point3fValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + Point3fDecoration(Point3fValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~Point3fDecoration() {} }; class ShotfDecoration : public ParameterDecoration { public: - ShotfDecoration(ShotfValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + ShotfDecoration(ShotfValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~ShotfDecoration() {} }; class ColorDecoration : public ParameterDecoration { public: - ColorDecoration(ColorValue* defvalue, const QString desc = QString(), const QString tltip = QString()); + ColorDecoration(ColorValue* defvalue, const QString& desc = QString(), const QString& tltip = QString()); ~ColorDecoration() {} }; class AbsPercDecoration : public ParameterDecoration { public: - AbsPercDecoration(AbsPercValue* defvalue, const float minVal, const float maxVal, const QString desc = QString(), const QString tltip = QString()); + AbsPercDecoration(AbsPercValue* defvalue, const float minVal, const float maxVal, const QString& desc = QString(), const QString& tltip = QString()); float min; float max; ~AbsPercDecoration() {} @@ -406,7 +406,7 @@ public: class EnumDecoration : public ParameterDecoration { public: - EnumDecoration(EnumValue* defvalue, QStringList values, const QString desc = QString(), const QString tltip = QString()); + EnumDecoration(EnumValue* defvalue, QStringList values, const QString& desc = QString(), const QString& tltip = QString()); QStringList enumvalues; ~EnumDecoration() {} }; @@ -422,7 +422,7 @@ public: class DynamicFloatDecoration : public ParameterDecoration { public: - DynamicFloatDecoration(DynamicFloatValue* defvalue, const float minVal, const float maxVal, const QString desc = QString(), const QString tltip = QString()); + DynamicFloatDecoration(DynamicFloatValue* defvalue, const float minVal, const float maxVal, const QString& desc = QString(), const QString& tltip = QString()); ~DynamicFloatDecoration() {}; float min; float max; @@ -431,7 +431,7 @@ public: class SaveFileDecoration : public ParameterDecoration { public: - SaveFileDecoration(FileValue* defvalue, const QString extension, const QString desc = QString(), const QString tltip = QString()); + SaveFileDecoration(FileValue* defvalue, const QString& extension, const QString& desc = QString(), const QString& tltip = QString()); ~SaveFileDecoration() {} QString ext; @@ -440,7 +440,7 @@ public: class OpenFileDecoration : public ParameterDecoration { public: - OpenFileDecoration(FileValue* directorydefvalue, const QStringList extensions, const QString desc = QString(), const QString tltip = QString()); + OpenFileDecoration(FileValue* directorydefvalue, const QStringList& extensions, const QString& desc = QString(), const QString& tltip = QString()); ~OpenFileDecoration() {} QStringList exts; @@ -450,12 +450,12 @@ public: class MeshDecoration : public ParameterDecoration { public: - MeshDecoration(MeshValue* defvalue, MeshDocument* doc, const QString desc = QString(), const QString tltip = QString()); + MeshDecoration(MeshValue* defvalue, MeshDocument* doc, const QString& desc = QString(), const QString& tltip = QString()); - MeshDecoration(int meshind, MeshDocument* doc, const QString desc = QString(), const QString tltip = QString()); + MeshDecoration(int meshind, MeshDocument* doc, const QString& desc = QString(), const QString& tltip = QString()); //WARNING: IT SHOULD BE USED ONLY BY MESHLABSERVER!!!!!!! - MeshDecoration(int meshind, const QString desc = QString(), const QString tltip = QString()); + MeshDecoration(int meshind, const QString& desc = QString(), const QString& tooltip = QString()); ~MeshDecoration() {} @@ -513,7 +513,7 @@ public: ParameterDecoration* pd; - RichParameter(const QString nm, Value* v, ParameterDecoration* prdec, bool isxmlpar = false); + RichParameter(const QString& nm, Value* v, ParameterDecoration* prdec, bool isxmlpar = false); virtual void accept(Visitor& v) = 0; virtual bool operator==(const RichParameter& rp) = 0; virtual ~RichParameter(); @@ -531,8 +531,8 @@ class RichBool : public RichParameter public: RichBool(const QString nm, const bool defval); RichBool(const QString nm, const bool defval, const QString desc); - RichBool(const QString nm, const bool defval, const QString desc, const QString tltip); - RichBool(const QString nm, const bool val, const bool defval, const QString desc, const QString tltip, bool isxmlpar = false); + RichBool(const QString& nm, const bool defval, const QString& desc, const QString& tltip); + RichBool(const QString& nm, const bool val, const bool defval, const QString& desc, const QString& tltip, bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); @@ -542,8 +542,8 @@ public: class RichInt : public RichParameter { public: - RichInt(const QString nm, const int defval, const QString desc = QString(), const QString tltip = QString()); - RichInt(const QString nm, const int val, const int defval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichInt(const QString& nm, const int defval, const QString& desc = QString(), const QString& tltip = QString()); + RichInt(const QString& nm, const int val, const int defval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichInt(); @@ -552,8 +552,8 @@ public: class RichFloat : public RichParameter { public: - RichFloat(const QString nm, const float defval, const QString desc = QString(), const QString tltip = QString()); - RichFloat(const QString nm, const float val, const float defval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichFloat(const QString& nm, const float defval, const QString& desc = QString(), const QString& tltip = QString()); + RichFloat(const QString& nm, const float val, const float defval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichFloat(); @@ -562,10 +562,10 @@ public: class RichString : public RichParameter { public: - RichString(const QString nm, const QString defval, const QString desc, const QString tltip); - RichString(const QString nm, const QString defval); - RichString(const QString nm, const QString defval, const QString desc); - RichString(const QString nm, const QString val, const QString defval, const QString desc, const QString tltip, bool isxmlpar = false); + RichString(const QString& nm, const QString& defval, const QString& desc, const QString& tltip); + RichString(const QString& nm, const QString& defval); + RichString(const QString& nm, const QString& defval, const QString& desc); + RichString(const QString& nm, const QString& val, const QString& defval, const QString& desc, const QString& tltip, bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichString(); @@ -574,9 +574,9 @@ public: class RichMatrix44f : public RichParameter { public: - RichMatrix44f(const QString nm, const vcg::Matrix44f& defval, const QString desc = QString(), const QString tltip = QString()); - RichMatrix44f(const QString nm, const vcg::Matrix44d& defval, const QString desc = QString(), const QString tltip = QString()); - RichMatrix44f(const QString nm, const vcg::Matrix44f& val, const vcg::Matrix44f& defval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichMatrix44f(const QString& nm, const vcg::Matrix44f& defval, const QString& desc = QString(), const QString& tltip = QString()); + RichMatrix44f(const QString& nm, const vcg::Matrix44d& defval, const QString& desc = QString(), const QString& tltip = QString()); + RichMatrix44f(const QString& nm, const vcg::Matrix44f& val, const vcg::Matrix44f& defval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichMatrix44f(); @@ -585,9 +585,9 @@ public: class RichPoint3f : public RichParameter { public: - RichPoint3f(const QString nm, const vcg::Point3f defval, const QString desc = QString(), const QString tltip = QString()); - RichPoint3f(const QString nm, const vcg::Point3d defval, const QString desc = QString(), const QString tltip = QString()); - RichPoint3f(const QString nm, const vcg::Point3f val, const vcg::Point3f defval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichPoint3f(const QString& nm, const vcg::Point3f& defval, const QString& desc = QString(), const QString& tltip = QString()); + RichPoint3f(const QString& nm, const vcg::Point3d& defval, const QString& desc = QString(), const QString& tltip = QString()); + RichPoint3f(const QString& nm, const vcg::Point3f& val, const vcg::Point3f& defval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichPoint3f(); @@ -595,8 +595,8 @@ public: class RichShotf : public RichParameter { public: - RichShotf(const QString nm, const vcg::Shotf defval, const QString desc = QString(), const QString tltip = QString()); - RichShotf(const QString nm, const vcg::Shotf val, const vcg::Shotf defval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichShotf(const QString& nm, const vcg::Shotf& defval, const QString& desc = QString(), const QString& tltip = QString()); + RichShotf(const QString& nm, const vcg::Shotf& val, const vcg::Shotf& defval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichShotf(); @@ -605,10 +605,10 @@ public: class RichColor : public RichParameter { public: - RichColor(const QString nm, const QColor defval); - RichColor(const QString nm, const QColor defval, const QString desc); - RichColor(const QString nm, const QColor defval, const QString desc, const QString tltip); - RichColor(const QString nm, const QColor val, const QColor defval, const QString desc, const QString tltip, bool isxmlpar = false); + RichColor(const QString& nm, const QColor& defval); + RichColor(const QString& nm, const QColor& defval, const QString& desc); + RichColor(const QString& nm, const QColor& defval, const QString& desc, const QString& tltip); + RichColor(const QString& nm, const QColor& val, const QColor& defval, const QString& desc, const QString& tltip, bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichColor(); @@ -618,8 +618,8 @@ public: class RichAbsPerc : public RichParameter { public: - RichAbsPerc(const QString nm, const float defval, const float minval, const float maxval, const QString desc = QString(), const QString tltip = QString()); - RichAbsPerc(const QString nm, const float val, const float defval, const float minval, const float maxval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichAbsPerc(const QString& nm, const float defval, const float minval, const float maxval, const QString& desc = QString(), const QString& tltip = QString()); + RichAbsPerc(const QString& nm, const float val, const float defval, const float minval, const float maxval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichAbsPerc(); @@ -628,8 +628,8 @@ public: class RichEnum : public RichParameter { public: - RichEnum(const QString nm, const int defval, const QStringList values, const QString desc = QString(), const QString tltip = QString()); - RichEnum(const QString nm, const int val, const int defval, const QStringList values, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichEnum(const QString& nm, const int defval, const QStringList& values, const QString& desc = QString(), const QString& tltip = QString()); + RichEnum(const QString& nm, const int val, const int defval, const QStringList& values, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichEnum(); @@ -642,14 +642,14 @@ public: //lastCreated = new RichMesh(pd.name, pd.val->getMesh(), dec->defVal->getMesh(), dec->meshdoc, dec->fieldDesc, dec->tooltip, pd.isDerivedFromXMLParam()); //else // lastCreated = new RichMesh(pd.name, dec->meshindex, pd.isDerivedFromXMLParam()); - RichMesh(const QString nm, MeshModel* defval, MeshDocument* doc, const QString desc = QString(), const QString tltip = QString()); - RichMesh(const QString nm, MeshModel* val, MeshModel* defval, MeshDocument* doc, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichMesh(const QString& nm, MeshModel* defval, MeshDocument* doc, const QString& desc = QString(), const QString& tltip = QString()); + RichMesh(const QString& nm, MeshModel* val, MeshModel* defval, MeshDocument* doc, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); - RichMesh(const QString nm, int meshindex, MeshDocument* doc, const QString desc = QString(), const QString tltip = QString()); + RichMesh(const QString& nm, int meshindex, MeshDocument* doc, const QString& desc = QString(), const QString& tltip = QString()); //WARNING: IT SHOULD BE USED ONLY BY MESHLABSERVER!!!!!!! - RichMesh(const QString nm, int meshind, bool isxmlpar = false); - RichMesh(const QString nm, int meshind, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichMesh(const QString& nm, int meshind, bool isxmlpar = false); + RichMesh(const QString& nm, int meshind, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); @@ -661,8 +661,8 @@ public: class RichFloatList : public RichParameter { public: - RichFloatList(const QString nm, FloatListValue* v, FloatListDecoration* prdec); - RichFloatList(const QString nm, FloatListValue* val, FloatListValue* v, FloatListDecoration* prdec, bool isxmlpar = false); + RichFloatList(const QString& nm, FloatListValue* v, FloatListDecoration* prdec); + RichFloatList(const QString& nm, FloatListValue* val, FloatListValue* v, FloatListDecoration* prdec, bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichFloatList(); @@ -671,8 +671,8 @@ public: class RichDynamicFloat : public RichParameter { public: - RichDynamicFloat(const QString nm, const float defval, const float minval, const float maxval, const QString desc = QString(), const QString tltip = QString()); - RichDynamicFloat(const QString nm, const float val, const float defval, const float minval, const float maxval, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichDynamicFloat(const QString& nm, const float defval, const float minval, const float maxval, const QString& desc = QString(), const QString& tltip = QString()); + RichDynamicFloat(const QString& nm, const float val, const float defval, const float minval, const float maxval, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichDynamicFloat(); @@ -682,7 +682,7 @@ public: class RichOpenFile : public RichParameter { public: - RichOpenFile(const QString nm, const QString directorydefval, const QStringList exts, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichOpenFile(const QString& nm, const QString& directorydefval, const QStringList& exts, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichOpenFile(); @@ -691,7 +691,7 @@ public: class RichSaveFile : public RichParameter { public: - RichSaveFile(const QString nm, const QString filedefval, const QString ext, const QString desc = QString(), const QString tltip = QString(), bool isxmlpar = false); + RichSaveFile(const QString& nm, const QString& filedefval, const QString& ext, const QString& desc = QString(), const QString& tltip = QString(), bool isxmlpar = false); void accept(Visitor& v); bool operator==(const RichParameter& rb); ~RichSaveFile(); @@ -812,9 +812,8 @@ public: //QMap paramMap; QList paramList; bool isEmpty() const; - //RichParameter* findParameter(QString name); - RichParameter* findParameter(QString name) const; - bool hasParameter(QString name) const; + RichParameter* findParameter(const QString& name) const; + bool hasParameter(const QString& name) const; RichParameterSet& operator=(const RichParameterSet& rps); @@ -825,31 +824,31 @@ public: RichParameterSet& addParam(RichParameter* pd); //remove a parameter from the set by name - RichParameterSet& removeParameter(QString name); + RichParameterSet& removeParameter(const QString& name); void clear(); - void setValue(const QString name, const Value& val); + void setValue(const QString& name, const Value& val); - bool getBool(QString name) const; - int getInt(QString name) const; - float getFloat(QString name) const; - QString getString(QString name) const; - vcg::Matrix44f getMatrix44(QString name) const; - vcg::Matrix44 getMatrix44m(QString name) const; - vcg::Point3f getPoint3f(QString name) const; - vcg::Point3 getPoint3m(QString name) const; - vcg::Shotf getShotf(QString name) const; - vcg::Shot getShotm(QString name) const; - QColor getColor(QString name) const; - vcg::Color4b getColor4b(QString name) const; - float getAbsPerc(QString name) const; - int getEnum(QString name) const; - MeshModel* getMesh(QString name) const; - QList getFloatList(QString name) const; - float getDynamicFloat(QString name) const; - QString getOpenFileName(QString name) const; - QString getSaveFileName(QString name) const; + bool getBool(const QString& name) const; + int getInt(const QString& name) const; + float getFloat(const QString& name) const; + QString getString(const QString& name) const; + vcg::Matrix44f getMatrix44(const QString& name) const; + vcg::Matrix44 getMatrix44m(const QString& name) const; + vcg::Point3f getPoint3f(const QString& name) const; + vcg::Point3 getPoint3m(const QString& name) const; + vcg::Shotf getShotf(const QString& name) const; + vcg::Shot getShotm(const QString& name) const; + QColor getColor(const QString& name) const; + vcg::Color4b getColor4b(const QString& name) const; + float getAbsPerc(const QString& name) const; + int getEnum(const QString& name) const; + MeshModel* getMesh(const QString& name) const; + QList getFloatList(const QString& name) const; + float getDynamicFloat(const QString& name) const; + QString getOpenFileName(const QString& name) const; + QString getSaveFileName(const QString& name) const; ~RichParameterSet(); @@ -859,4 +858,4 @@ public: -#endif \ No newline at end of file +#endif diff --git a/src/common/meshmodel.cpp b/src/common/meshmodel.cpp index 9786f4c06..3e19d5581 100644 --- a/src/common/meshmodel.cpp +++ b/src/common/meshmodel.cpp @@ -31,6 +31,7 @@ #include "mlexception.h" #include "ml_shared_data_context.h" +#include using namespace vcg; @@ -56,7 +57,7 @@ MeshModel *MeshDocument::getMesh(int i) return 0; } -MeshModel *MeshDocument::getMesh(QString name) +MeshModel *MeshDocument::getMesh(const QString& name) { foreach(MeshModel *mmp, meshList) { @@ -66,7 +67,7 @@ MeshModel *MeshDocument::getMesh(QString name) return 0; } -MeshModel *MeshDocument::getMeshByFullName(QString pathName) +MeshModel *MeshDocument::getMeshByFullName(const QString& pathName) { foreach(MeshModel *mmp, meshList) { @@ -77,15 +78,15 @@ MeshModel *MeshDocument::getMeshByFullName(QString pathName) } -void MeshDocument::setCurrentMesh( int i) +void MeshDocument::setCurrentMesh( int new_curr_id) { - if(i<0) + if(new_curr_id<0) { currentMesh=0; return; } - currentMesh = getMesh(i); - emit currentMeshChanged(i); + currentMesh = getMesh(new_curr_id); + emit currentMeshChanged(new_curr_id); assert(currentMesh); } @@ -101,9 +102,9 @@ RasterModel *MeshDocument::getRaster(int i) } //if i is <0 it means that no currentRaster is set -void MeshDocument::setCurrentRaster( int i) +void MeshDocument::setCurrentRaster( int new_curr_id) { - if(i<0) + if(new_curr_id<0) { currentRaster=0; return; @@ -111,25 +112,24 @@ void MeshDocument::setCurrentRaster( int i) foreach(RasterModel *rmp, rasterList) { - if(rmp->id() == i) + if(rmp->id() == new_curr_id) { currentRaster = rmp; return; } } assert(0); - return; } -void MeshDocument::requestUpdatingPerMeshDecorators(int meshid) +void MeshDocument::requestUpdatingPerMeshDecorators(int mesh_id) { - emit updateDecorators(meshid); + emit updateDecorators(mesh_id); } template QString NameDisambiguator(QList &elemList, QString meshLabel ) { - QString newName=meshLabel; + QString newName=std::move(meshLabel); typename QList::iterator mmi; for(mmi=elemList.begin(); mmi!=elemList.end(); ++mmi) @@ -173,7 +173,7 @@ QString NameDisambiguator(QList &elemList, QString meshLabel ) MeshModel * MeshDocument::addNewMesh(QString fullPath, QString label, bool setAsCurrent) { - QString newlabel = NameDisambiguator(this->meshList,label); + QString newlabel = NameDisambiguator(this->meshList,std::move(label)); if(!fullPath.isEmpty()) { @@ -192,7 +192,7 @@ MeshModel * MeshDocument::addNewMesh(QString fullPath, QString label, bool setAs return newMesh; } -MeshModel * MeshDocument::addOrGetMesh(QString fullPath, QString label, bool setAsCurrent) +MeshModel * MeshDocument::addOrGetMesh(QString fullPath, const QString& label, bool setAsCurrent) { MeshModel *newMesh = getMesh(label); if(newMesh) { @@ -200,16 +200,16 @@ MeshModel * MeshDocument::addOrGetMesh(QString fullPath, QString label, bool set this->setCurrentMesh(newMesh->id()); return newMesh; } - return addNewMesh(fullPath,label,setAsCurrent); + return addNewMesh(std::move(fullPath),label,setAsCurrent); } bool MeshDocument::delMesh(MeshModel *mmToDel) { if(!meshList.removeOne(mmToDel)) return false; - if((currentMesh == mmToDel) && (meshList.size() != 0)) + if((currentMesh == mmToDel) && (!meshList.empty())) setCurrentMesh(this->meshList.at(0)->id()); - else if (meshList.size() == 0) + else if (meshList.empty()) setCurrentMesh(-1); int index = mmToDel->id(); @@ -256,7 +256,7 @@ bool MeshDocument::delRaster(RasterModel *rasterToDel) if(currentRaster == rasterToDel) { - if (rasterList.size() > 0) + if (!rasterList.empty()) setCurrentRaster(rasterList.at(0)->id()); else setCurrentRaster(-1); @@ -330,7 +330,7 @@ bool MeshDocument::hasBeenModified() // currTime.start(); //} -MeshDocument::MeshDocument() : QObject(),Log(),xmlhistory() +MeshDocument::MeshDocument() { meshIdCounter=0; rasterIdCounter=0; @@ -364,7 +364,7 @@ void MeshModel::UpdateBoxAndNormals() } } -MeshModel::MeshModel(MeshDocument *_parent, QString fullFileName, QString labelName) +MeshModel::MeshModel(MeshDocument *_parent, const QString& fullFileName, const QString& labelName) { /*glw.m = &(cm);*/ Clear(); @@ -444,7 +444,7 @@ Plane::Plane(const Plane& pl) image = QImage(pl.image); } -Plane::Plane(const QString pathName, const int _semantic) +Plane::Plane(const QString& pathName, const int _semantic) { semantic =_semantic; fullPathFileName = pathName; @@ -453,16 +453,14 @@ Plane::Plane(const QString pathName, const int _semantic) } RasterModel::RasterModel(MeshDocument *parent, QString _rasterName) - : MeshLabRenderRaster() { _id=parent->newRasterId(); par = parent; - this->_label= _rasterName; + this->_label= std::move(_rasterName); visible=true; } RasterModel::RasterModel() - : MeshLabRenderRaster() { } @@ -474,7 +472,7 @@ MeshLabRenderRaster::MeshLabRenderRaster() } MeshLabRenderRaster::MeshLabRenderRaster( const MeshLabRenderRaster& rm ) - :shot(rm.shot),planeList() + :shot(rm.shot) { for(QList::const_iterator it = rm.planeList.begin();it != rm.planeList.end();++it) { @@ -777,7 +775,7 @@ int MeshModel::dataMask() const } MeshDocumentStateData::MeshDocumentStateData() - :_lock(QReadWriteLock::Recursive),_existingmeshesbeforeoperation() + :_lock(QReadWriteLock::Recursive) { } diff --git a/src/common/meshmodel.h b/src/common/meshmodel.h index 5213becc1..6e69d8f64 100644 --- a/src/common/meshmodel.h +++ b/src/common/meshmodel.h @@ -128,7 +128,7 @@ public: MM_ALL = 0xffffffff }; - MeshModel(MeshDocument *parent, QString fullFileName, QString labelName); + MeshModel(MeshDocument *parent, const QString& fullFileName, const QString& labelName); MeshModel(MeshModel* cp); ~MeshModel() { @@ -268,7 +268,7 @@ public: const QString shortName() const { return QFileInfo(fullPathFileName).fileName(); } Plane(const Plane& pl); - Plane(const QString pathName, const int _semantic); + Plane(const QString& pathName, const int _semantic); }; //end class Plane @@ -484,8 +484,8 @@ public: /// returns the mesh with the given unique id MeshModel *getMesh(int id); - MeshModel *getMesh(QString name); - MeshModel *getMeshByFullName(QString pathName); + MeshModel *getMesh(const QString& name); + MeshModel *getMeshByFullName(const QString& pathName); //set the current mesh to be the one with the given ID @@ -607,7 +607,7 @@ private: public: ///add a new mesh with the given name MeshModel *addNewMesh(QString fullPath, QString Label, bool setAsCurrent=true); - MeshModel *addOrGetMesh(QString fullPath, QString Label, bool setAsCurrent=true); + MeshModel *addOrGetMesh(QString fullPath, const QString& Label, bool setAsCurrent=true); ///remove the mesh from the list and delete it from memory diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp index 7e7370a74..667a59869 100644 --- a/src/common/pluginmanager.cpp +++ b/src/common/pluginmanager.cpp @@ -190,7 +190,7 @@ void PluginManager::loadPlugins(RichParameterSet& defaultGlobal) } // Search among all the decorator plugins the one that contains a decoration with the given name -MeshDecorateInterface *PluginManager::getDecoratorInterfaceByName(QString name) +MeshDecorateInterface *PluginManager::getDecoratorInterfaceByName(const QString& name) { foreach(MeshDecorateInterface *tt, this->meshDecoratePlugins()) { diff --git a/src/common/pluginmanager.h b/src/common/pluginmanager.h index cf235a1d3..3d8aa9bb3 100644 --- a/src/common/pluginmanager.h +++ b/src/common/pluginmanager.h @@ -64,7 +64,7 @@ public: QMap generateFilterParameterMap(); - MeshDecorateInterface* getDecoratorInterfaceByName(QString name); + MeshDecorateInterface* getDecoratorInterfaceByName(const QString& name); QDir pluginsDir; QMap actionFilterMap;