mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-17 01:54:42 +00:00
Harmless clang warnings
This commit is contained in:
parent
38e2ec8a22
commit
889522d87b
@ -34,24 +34,27 @@ class QDomElement;
|
||||
class FilterNameParameterValuesPair
|
||||
{
|
||||
public:
|
||||
virtual QString filterName() const = 0;
|
||||
virtual bool isXMLFilter() const = 0;
|
||||
};
|
||||
virtual QString filterName() const = 0;
|
||||
virtual bool isXMLFilter() const = 0;
|
||||
virtual ~FilterNameParameterValuesPair(){}
|
||||
};
|
||||
|
||||
class XMLFilterNameParameterValuesPair : public FilterNameParameterValuesPair
|
||||
{
|
||||
public:
|
||||
bool isXMLFilter() const {return true;}
|
||||
QString filterName() const {return pair.first;}
|
||||
QPair< QString , QMap<QString,QString> > pair;
|
||||
~XMLFilterNameParameterValuesPair(){}
|
||||
bool isXMLFilter() const {return true;}
|
||||
QString filterName() const {return pair.first;}
|
||||
QPair< QString , QMap<QString,QString> > pair;
|
||||
};
|
||||
|
||||
class OldFilterNameParameterValuesPair : public FilterNameParameterValuesPair
|
||||
{
|
||||
public:
|
||||
bool isXMLFilter() const {return false;}
|
||||
QString filterName() const {return pair.first;}
|
||||
QPair< QString , RichParameterSet > pair;
|
||||
~OldFilterNameParameterValuesPair(){}
|
||||
bool isXMLFilter() const {return false;}
|
||||
QString filterName() const {return pair.first;}
|
||||
QPair< QString , RichParameterSet > pair;
|
||||
};
|
||||
|
||||
/*
|
||||
@ -72,7 +75,7 @@ public:
|
||||
|
||||
QList< FilterNameParameterValuesPair* > filtparlist;
|
||||
typedef QList< FilterNameParameterValuesPair* >::iterator iterator;
|
||||
|
||||
|
||||
public slots:
|
||||
void addExecutedXMLFilter(const QString& name,const QMap<QString,QString>& parvalue);
|
||||
};
|
||||
|
||||
@ -651,8 +651,6 @@ void MLSyntaxHighlighter::highlightBlock( const QString& text )
|
||||
index = keyword.indexIn(text, index + length);
|
||||
}
|
||||
QRegExp nokeyword = syntax.matchIdentifiersButNotReservedWords();
|
||||
QString tmp = nokeyword.pattern();
|
||||
SyntaxTreeNode* root = syntax.functionsLibrary()->getItem(QModelIndex());
|
||||
index = 0;
|
||||
//QTextCharFormat form;
|
||||
//form.setForeground(Qt::red);
|
||||
@ -660,10 +658,7 @@ void MLSyntaxHighlighter::highlightBlock( const QString& text )
|
||||
{
|
||||
index = nokeyword.indexIn(text,index);
|
||||
if (index >= 0)
|
||||
{
|
||||
bool matchedchar = colorTextIfInsideTree(nokeyword.cap(),root,index);
|
||||
index = index + nokeyword.matchedLength();
|
||||
}
|
||||
}
|
||||
setCurrentBlockState(0);
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
FilterThread* FilterThread::_cur = NULL;
|
||||
|
||||
FilterThread::FilterThread(const QString& fname,const QMap<QString,QString>& parexpval,PluginManager& pm, MeshDocument& md)
|
||||
:QThread(),_glwid(NULL),_fname(fname),_parexpval(parexpval),_pm(pm),_md(md)
|
||||
:QThread(),_fname(fname),_parexpval(parexpval),_pm(pm),_md(md),_glwid(NULL)
|
||||
{
|
||||
_glwid = new QGLWidget();
|
||||
}
|
||||
|
||||
@ -1146,10 +1146,6 @@ void MainWindow::startFilter()
|
||||
// if no dialog is created the filter must be executed immediatel
|
||||
if(!xmldialog->showAutoDialog(filt,PM,meshDoc(), this, GLA()))
|
||||
{
|
||||
MeshLabFilterInterface *ifilter = filt.filterInterface;
|
||||
bool jscode = (filt.xmlInfo->filterScriptCode(filt.act->text()) != "");
|
||||
bool filtercpp = (ifilter != NULL) && (!jscode);
|
||||
|
||||
/*Mock Parameters (there are no ones in the filter indeed) for the filter history.The filters with parameters are inserted by the applyClick of the XMLStdParDialog.
|
||||
That is the only place where I can easily evaluate the parameter values without writing a long, boring and horrible if on the filter type for the correct evaluation of the expressions contained inside the XMLWidgets*/
|
||||
QMap<QString,QString> mock;
|
||||
@ -1332,7 +1328,6 @@ void MainWindow::initDocumentMeshRenderState(MeshLabXMLFilterContainer* mfc)
|
||||
{
|
||||
Env env;
|
||||
QScriptValue val = env.loadMLScriptEnv(*meshDoc(),PM);
|
||||
bool err = val.isError();
|
||||
EnvWrap envwrap(env);
|
||||
//I have to check which are the meshes requested as parameters by the filter. It's disgusting but there is not other way.
|
||||
MLXMLPluginInfo::XMLMapList params = mfc->xmlInfo->filterParameters(fname);
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include <QDialogButtonBox>
|
||||
|
||||
MeshLabXMLStdDialog::MeshLabXMLStdDialog(QWidget *p)
|
||||
:QDockWidget(QString("Plugin"), p),isfilterexecuting(false),showHelp(false),env()
|
||||
:QDockWidget(QString("Plugin"), p),isfilterexecuting(false),env(),showHelp(false)
|
||||
{
|
||||
|
||||
curmask = 0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user