diff --git a/src/common/xmlfilterinfo.cpp b/src/common/xmlfilterinfo.cpp index c1c16e5dd..dd5cab7cd 100644 --- a/src/common/xmlfilterinfo.cpp +++ b/src/common/xmlfilterinfo.cpp @@ -428,6 +428,11 @@ QString MLXMLPluginInfo::pluginName() const return QString(); } +void MLXMLPluginInfo::destroyXMLPluginInfo( MLXMLPluginInfo* plug ) +{ + delete plug; +} + bool MLXMLUtilityFunctions::getEnumNamesValuesFromString( const QString& st,QMap& mp ) { @@ -490,7 +495,8 @@ QString MLXMLUtilityFunctions::generateXMLFilter( const MLXMLFilterSubTree& filt + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterClass) + " " + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterPreCond) + " " + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterPostCond) + " " - + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterArity) + ">"; + + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterArity) + " " + + xmlAttrNameValue(filter.filterinfo,MLXMLElNames::filterIsInterruptible) + ">"; result += "<" + MLXMLElNames::filterHelpTag + ">" + filter.filterinfo[MLXMLElNames::filterHelpTag] + ""; if (!(filter.filterinfo[MLXMLElNames::filterJSCodeTag].isEmpty())) result += "<" + MLXMLElNames::filterJSCodeTag + ">" + filter.filterinfo[MLXMLElNames::filterJSCodeTag] + ""; @@ -783,7 +789,7 @@ void MLXMLElNames::initMLXMLPluginAttributesTag( QStringList& ls ) void MLXMLElNames::initMLXMLFilterAttributesTag( QStringList& ls ) { - ls << MLXMLElNames::filterName << MLXMLElNames::filterScriptFunctName << MLXMLElNames::filterClass << MLXMLElNames::filterArity << MLXMLElNames::filterPreCond << MLXMLElNames::filterPostCond; + ls << MLXMLElNames::filterName << MLXMLElNames::filterScriptFunctName << MLXMLElNames::filterClass << MLXMLElNames::filterArity << MLXMLElNames::filterPreCond << MLXMLElNames::filterPostCond << MLXMLElNames::filterIsInterruptible; } void MLXMLElNames::initMLXMLFilterElemsTag( QStringList& ls ) diff --git a/src/common/xmlfilterinfo.h b/src/common/xmlfilterinfo.h index 6c408de63..77802548c 100644 --- a/src/common/xmlfilterinfo.h +++ b/src/common/xmlfilterinfo.h @@ -167,9 +167,9 @@ public: typedef QMap XMLMap; typedef QList< XMLMap > XMLMapList; static MLXMLPluginInfo* createXMLPluginInfo( const QString& XMLFileName,const QString& XMLSchemaFileName,XMLMessageHandler& errXML); + static void destroyXMLPluginInfo(MLXMLPluginInfo* plug); static XMLMap mapFromString(const QString& st,const QRegExp& extsep = extSep(),const QRegExp& intsep = intSep()); static XMLMapList mapListFromStringList(const QStringList& list); - inline static void deleteXMLFileInfo(MLXMLPluginInfo* xmlInfo) {delete xmlInfo;} QString interfaceAttribute(const QString& attribute) const;