From 185923a92c76805bc1b410b0f655e214394a8573 Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 30 Nov 2016 09:12:53 +0300 Subject: [PATCH] Update line endings according to coding rules --- .../CollectionPlugin_Group.cpp | 2 +- .../CollectionPlugin_WidgetCreator.cpp | 2 +- .../CollectionPlugin_WidgetField.cpp | 52 +++++++++---------- .../CollectionPlugin_WidgetField.h | 4 +- src/Events/Events_Loop.cpp | 8 +-- .../ExchangePlugin_ExportFeature.cpp | 4 +- .../FeaturesPlugin_Placement.cpp | 4 +- .../FeaturesPlugin_Rotation.cpp | 4 +- src/Model/Model_AttributeSelection.cpp | 2 +- src/Model/Model_AttributeStringArray.cpp | 2 +- src/Model/Model_AttributeTables.cpp | 6 +-- src/Model/Model_AttributeTables.h | 2 +- src/Model/Model_ResultField.cpp | 2 +- src/Model/Model_SelectionNaming.cpp | 2 +- src/ModelAPI/ModelAPI_AttributeTables.h | 2 +- src/ModelAPI/ModelAPI_Events.cpp | 4 +- src/ModelHighAPI/ModelHighAPI_Tools.cpp | 2 +- src/ModelHighAPI/ModelHighAPI_Tools.h | 4 +- .../ParametersPlugin_EvalListener.cpp | 2 +- src/PartSet/PartSet_MenuMgr.cpp | 2 +- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/CollectionPlugin/CollectionPlugin_Group.cpp b/src/CollectionPlugin/CollectionPlugin_Group.cpp index ede838a3e..dd6e1d302 100644 --- a/src/CollectionPlugin/CollectionPlugin_Group.cpp +++ b/src/CollectionPlugin/CollectionPlugin_Group.cpp @@ -19,7 +19,7 @@ CollectionPlugin_Group::CollectionPlugin_Group() void CollectionPlugin_Group::initAttributes() { - data()->addAttribute(CollectionPlugin_Group::LIST_ID(), + data()->addAttribute(CollectionPlugin_Group::LIST_ID(), ModelAPI_AttributeSelectionList::typeId()); } diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetCreator.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetCreator.cpp index a369cf36e..7b8154b1c 100644 --- a/src/CollectionPlugin/CollectionPlugin_WidgetCreator.cpp +++ b/src/CollectionPlugin/CollectionPlugin_WidgetCreator.cpp @@ -30,7 +30,7 @@ ModuleBase_ModelWidget* CollectionPlugin_WidgetCreator::createWidgetByType( if (myPanelTypes.find(theType) == myPanelTypes.end()) return aWidget; - if (theType == "field-panel") { + if (theType == "field-panel") { aWidget = new CollectionPlugin_WidgetField(theParent, theWorkshop, theWidgetApi); } diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp index 7a39b5f7e..b0113c677 100644 --- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp +++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp @@ -46,17 +46,17 @@ const char* MYFalse = "False"; class DataTableItemDelegate : public QStyledItemDelegate { public: - DataTableItemDelegate(ModelAPI_AttributeTables::ValueType theType) : + DataTableItemDelegate(ModelAPI_AttributeTables::ValueType theType) : QStyledItemDelegate() { myType = theType; } - virtual QWidget* createEditor(QWidget* theParent, - const QStyleOptionViewItem & theOption, + virtual QWidget* createEditor(QWidget* theParent, + const QStyleOptionViewItem & theOption, const QModelIndex& theIndex) const; ModelAPI_AttributeTables::ValueType dataType() const { return myType; } void setDataType(ModelAPI_AttributeTables::ValueType theType) { myType = theType; } - + signals: void startEditing(); @@ -64,8 +64,8 @@ private: ModelAPI_AttributeTables::ValueType myType; }; -QWidget* DataTableItemDelegate::createEditor(QWidget* theParent, - const QStyleOptionViewItem & theOption, +QWidget* DataTableItemDelegate::createEditor(QWidget* theParent, + const QStyleOptionViewItem & theOption, const QModelIndex& theIndex ) const { if ((theIndex.column() == 0) && (theIndex.row() > 0)) { @@ -77,8 +77,8 @@ QWidget* DataTableItemDelegate::createEditor(QWidget* theParent, QLineEdit* aLineEdt = 0; switch (myType) { case ModelAPI_AttributeTables::DOUBLE: - aLineEdt = dynamic_cast(QStyledItemDelegate::createEditor(theParent, - theOption, + aLineEdt = dynamic_cast(QStyledItemDelegate::createEditor(theParent, + theOption, theIndex)); if (aLineEdt) { aLineEdt->setValidator(new QDoubleValidator(aLineEdt)); @@ -86,15 +86,15 @@ QWidget* DataTableItemDelegate::createEditor(QWidget* theParent, } break; case ModelAPI_AttributeTables::INTEGER: - aLineEdt = dynamic_cast(QStyledItemDelegate::createEditor(theParent, - theOption, + aLineEdt = dynamic_cast(QStyledItemDelegate::createEditor(theParent, + theOption, theIndex)); if (aLineEdt) { aLineEdt->setValidator(new QIntValidator(aLineEdt)); return aLineEdt; } break; - case ModelAPI_AttributeTables::BOOLEAN: + case ModelAPI_AttributeTables::BOOLEAN: { QComboBox* aBox = new QComboBox(theParent); aBox->addItem(MYFalse); @@ -112,8 +112,8 @@ QWidget* DataTableItemDelegate::createEditor(QWidget* theParent, //********************************************************************************** //********************************************************************************** CollectionPlugin_WidgetField:: - CollectionPlugin_WidgetField(QWidget* theParent, - ModuleBase_IWorkshop* theWorkshop, + CollectionPlugin_WidgetField(QWidget* theParent, + ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData): ModuleBase_WidgetSelector(theParent, theWorkshop, theData), myHeaderEditor(0), myIsEditing(false), myActivation(false) @@ -129,7 +129,7 @@ ModuleBase_WidgetSelector(theParent, theWorkshop, theData), myHeaderEditor(0), // Type of shapes myShapeTypeCombo = new QComboBox(aTypesWgt); QStringList aShapeTypes; - aShapeTypes << tr("Vertices") << tr("Edges") << tr("Faces") + aShapeTypes << tr("Vertices") << tr("Edges") << tr("Faces") << tr("Solids") << tr("Objects") << tr("Parts"); myShapeTypeCombo->addItems(aShapeTypes); aTypesLayout->addRow(tr("Type of shapes"), myShapeTypeCombo); @@ -137,7 +137,7 @@ ModuleBase_WidgetSelector(theParent, theWorkshop, theData), myHeaderEditor(0), // Type of field myFieldTypeCombo = new QComboBox(aTypesWgt); QStringList aFieldTypes; - aFieldTypes << tr("Boolean") << tr("Integer") << tr("Double") + aFieldTypes << tr("Boolean") << tr("Integer") << tr("Double") << tr("String"); myFieldTypeCombo->addItems(aFieldTypes); myFieldTypeCombo->setCurrentIndex(2); @@ -320,7 +320,7 @@ bool CollectionPlugin_WidgetField::eventFilter(QObject* theObject, QEvent* theEv } } } else if ((theObject == myHeaderEditor) && (theEvent->type() == QEvent::FocusOut)) { - //QHeaderView* aHeader = + //QHeaderView* aHeader = // static_cast(myHeaderEditor->parentWidget()->parentWidget()); QString aNewTitle = myHeaderEditor->text(); //save item text @@ -358,7 +358,7 @@ QTableWidgetItem* CollectionPlugin_WidgetField::createDefaultItem() const case ModelAPI_AttributeTables::INTEGER: aItem->setText("0"); break; - case ModelAPI_AttributeTables::BOOLEAN: + case ModelAPI_AttributeTables::BOOLEAN: aItem->setText(MYFalse); break; } @@ -377,10 +377,10 @@ QTableWidgetItem* CollectionPlugin_WidgetField:: case ModelAPI_AttributeTables::INTEGER: aItem->setText(QString::number(theVal.myInt)); break; - case ModelAPI_AttributeTables::BOOLEAN: + case ModelAPI_AttributeTables::BOOLEAN: aItem->setText(theVal.myBool? MYTrue : MYFalse); break; - case ModelAPI_AttributeTables::STRING: + case ModelAPI_AttributeTables::STRING: aItem->setText(theVal.myStr.c_str()); } return aItem; @@ -443,7 +443,7 @@ bool CollectionPlugin_WidgetField::storeValueCustom() QTableWidget* aTable = myDataTblList.first(); int aRows = aTable->rowCount(); // first column contains selected names which should not be stored - int aColumns = aTable->columnCount() - 1; + int aColumns = aTable->columnCount() - 1; aTablesAttr->setSize(aRows, aColumns, aNbSteps); aTablesAttr->setType((ModelAPI_AttributeTables::ValueType)aFldType); @@ -676,7 +676,7 @@ void CollectionPlugin_WidgetField::onAddStep() aTablesAttr->setSize(aTablesAttr->rows(), aTablesAttr->columns(), myDataTblList.size()); - AttributeSelectionListPtr aSelList = + AttributeSelectionListPtr aSelList = myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID()); if (!aSelList->isInitialized()) return; @@ -755,10 +755,10 @@ void CollectionPlugin_WidgetField::onSelectionChanged() if (myShapeTypeCombo->currentIndex() == 5) return; - QList aSelected = + QList aSelected = myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls); - AttributeSelectionListPtr aSelList = + AttributeSelectionListPtr aSelList = myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID()); aSelList->setSelectionType(getSelectionType(myShapeTypeCombo->currentIndex())); aSelList->clear(); @@ -785,7 +785,7 @@ void CollectionPlugin_WidgetField::onSelectionChanged() QTableWidgetItem* aItem = 0; foreach(QTableWidget* aTable, myDataTblList) { aTable->setRowCount(aNewRows); - if (aNewRows > aRows) { + if (aNewRows > aRows) { // Add new data for(int i = 0; i < aColumns; i++) { if (i == 0) { @@ -839,7 +839,7 @@ void CollectionPlugin_WidgetField::onFieldTypeChanged(int theIdx) aTable->item(j, i)->setText("0"); } break; - case ModelAPI_AttributeTables::BOOLEAN: + case ModelAPI_AttributeTables::BOOLEAN: aTable->item(j, i)->setText(MYFalse); break; } @@ -877,7 +877,7 @@ void CollectionPlugin_WidgetField::onShapeTypeChanged(int theType) { activateSelectionAndFilters(theType == 5? false:true); - AttributeSelectionListPtr aSelList = + AttributeSelectionListPtr aSelList = myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID()); std::string aTypeName = getSelectionType(theType); diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.h b/src/CollectionPlugin/CollectionPlugin_WidgetField.h index 8466877d8..14c25fb4b 100644 --- a/src/CollectionPlugin/CollectionPlugin_WidgetField.h +++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.h @@ -38,8 +38,8 @@ class CollectionPlugin_WidgetField : public ModuleBase_WidgetSelector { Q_OBJECT public: - CollectionPlugin_WidgetField(QWidget* theParent, - ModuleBase_IWorkshop* theWorkshop, + CollectionPlugin_WidgetField(QWidget* theParent, + ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData); virtual ~CollectionPlugin_WidgetField() {} diff --git a/src/Events/Events_Loop.cpp b/src/Events/Events_Loop.cpp index cd2e65f92..013e0a02d 100644 --- a/src/Events/Events_Loop.cpp +++ b/src/Events/Events_Loop.cpp @@ -74,7 +74,7 @@ void Events_Loop::send(const std::shared_ptr& theMessage, bool i } } // send - std::map > >::iterator aFindID = + std::map > >::iterator aFindID = myListeners.find(theMessage->eventID().eventText()); if (aFindID != myListeners.end()) { std::map >::iterator aFindSender = aFindID->second.find( @@ -98,14 +98,14 @@ void Events_Loop::registerListener(Events_Listener* theListener, const Events_ID myImmediateListeners[theID.eventText()] = theListener; return; } - std::map > >::iterator aFindID = + std::map > >::iterator aFindID = myListeners.find(theID.eventText()); if (aFindID == myListeners.end()) { // create container associated with ID myListeners[theID.eventText()] = std::map >(); aFindID = myListeners.find(theID.eventText()); } - std::map >::iterator aFindSender = + std::map >::iterator aFindSender = aFindID->second.find(theSender); if (aFindSender == aFindID->second.end()) { // create container associated with sender aFindID->second[theSender] = std::list(); @@ -191,7 +191,7 @@ void Events_Loop::flush(const Events_ID& theID) } } // send accumulated messages to "groupListeners" - std::map > >::iterator aFindID = + std::map > >::iterator aFindID = myListeners.find(theID.eventText()); if (aFindID != myListeners.end()) { std::map >::iterator aFindSender = diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index e2bbfa0e5..95b47c869 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -229,7 +229,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) // conversion of dimension std::string aSelectionType = aSelectionList->selectionType(); - std::string aDimensionString = + std::string aDimensionString = ExchangePlugin_Tools::selectionType2xaoDimension(aSelectionType); XAO::Dimension aGroupDimension = XAO::XaoUtils::stringToDimension(aDimensionString); @@ -263,7 +263,7 @@ void ExchangePlugin_ExportFeature::exportXAO(const std::string& theFileName) // conversion of dimension std::string aSelectionType = aSelectionList->selectionType(); - std::string aDimensionString = + std::string aDimensionString = ExchangePlugin_Tools::selectionType2xaoDimension(aSelectionType); XAO::Dimension aFieldDimension = XAO::XaoUtils::stringToDimension(aDimensionString); bool isWholePart = aSelectionType == "part"; diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index 0ffb26ed7..c28d769d0 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -197,7 +197,7 @@ void FeaturesPlugin_Placement::loadNamingDS(GeomAlgoAPI_Transform& theTransformA std::string aPlacedName = "Placed"; std::shared_ptr aSubShapes = theTransformAlgo.mapOfSubShapes(); - FeaturesPlugin_Tools::storeModifiedShapes(theTransformAlgo, theResultBody, - theBaseShape, aPlacedTag, aPlacedName, + FeaturesPlugin_Tools::storeModifiedShapes(theTransformAlgo, theResultBody, + theBaseShape, aPlacedTag, aPlacedName, *aSubShapes.get()); } diff --git a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp index 614264603..9ba830b83 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp @@ -132,7 +132,7 @@ void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo, std::string aRotatedName = "Rotated"; std::shared_ptr aSubShapes = theRotaionAlgo.mapOfSubShapes(); - FeaturesPlugin_Tools::storeModifiedShapes(theRotaionAlgo, theResultBody, - theBaseShape, aRotatedTag, aRotatedName, + FeaturesPlugin_Tools::storeModifiedShapes(theRotaionAlgo, theResultBody, + theBaseShape, aRotatedTag, aRotatedName, *aSubShapes.get()); } diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index e065c1e81..2b3fe9b78 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -711,7 +711,7 @@ void Model_AttributeSelection::selectBody( aFeatureOwner->removeResults(0, false); } aSel.Select(aNewSub, aNewContext); - + if (aEraseResults) { // flash after Select : in Groups it makes selection with shift working static Events_Loop* aLoop = Events_Loop::loop(); static const Events_ID kDeletedEvent = aLoop->eventByName(EVENT_OBJECT_DELETED); diff --git a/src/Model/Model_AttributeStringArray.cpp b/src/Model/Model_AttributeStringArray.cpp index 82f35c511..fa997a64d 100644 --- a/src/Model/Model_AttributeStringArray.cpp +++ b/src/Model/Model_AttributeStringArray.cpp @@ -17,7 +17,7 @@ int Model_AttributeStringArray::size() if (myArray.IsNull() || !myArray->IsValid()) { // this could be on undo and then redo creation of the attribute // in result creation it may be uninitialized - myIsInitialized = + myIsInitialized = myLab.FindAttribute(TDataStd_ExtStringArray::GetID(), myArray) == Standard_True; } // checking the validity because attribute (as a field) may be presented, diff --git a/src/Model/Model_AttributeTables.cpp b/src/Model/Model_AttributeTables.cpp index 77930e5a2..6bfe82d07 100644 --- a/src/Model/Model_AttributeTables.cpp +++ b/src/Model/Model_AttributeTables.cpp @@ -64,10 +64,10 @@ void Model_AttributeTables::setSize(const int theRows, const int theColumns, con (myType == ModelAPI_AttributeTables::BOOLEAN) ? new TColStd_HArray1OfByte(0, aNewSize - 1) : Handle(TColStd_HArray1OfByte)(); Handle(TColStd_HArray1OfInteger) anOldInt, aNewInt = - (myType == ModelAPI_AttributeTables::INTEGER) ? + (myType == ModelAPI_AttributeTables::INTEGER) ? new TColStd_HArray1OfInteger(0, aNewSize - 1) : Handle(TColStd_HArray1OfInteger)(); Handle(TColStd_HArray1OfExtendedString) anOldStr, aNewStr = - (myType == ModelAPI_AttributeTables::STRING) ? + (myType == ModelAPI_AttributeTables::STRING) ? new TColStd_HArray1OfExtendedString(0, aNewSize - 1) : Handle(TColStd_HArray1OfExtendedString)(); if (aSize != 0) { // copy the previous values into new positions, otherwise default values @@ -154,7 +154,7 @@ void Model_AttributeTables::setType(ModelAPI_AttributeTables::ValueType theType) myLab.ForgetAttribute(MY_ARRAY_ID(theType)); myType = theType; int aTables = myTables; - myTables = 0; // to let setSize know that there is no old array + myTables = 0; // to let setSize know that there is no old array setSize(myRows, myCols, aTables); } else { myType = theType; diff --git a/src/Model/Model_AttributeTables.h b/src/Model/Model_AttributeTables.h index 8752ffa72..62ac72254 100644 --- a/src/Model/Model_AttributeTables.h +++ b/src/Model/Model_AttributeTables.h @@ -22,7 +22,7 @@ /// /// The type of values can be changed. But all the values in the tables must have the same one /// type. The currently allowed types now are: Boolean, Integer, Double, String. -/// By default there is only one table, but it may be increased/decreased by adding/removing +/// By default there is only one table, but it may be increased/decreased by adding/removing /// tables one by one. /// The number of rows and columns are equal in all tables. If table, row or column is added, /// the previous values are kept unchanged. New cells are filled by zero, false or empty strings. diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp index f10fe16af..0c295fd43 100644 --- a/src/Model/Model_ResultField.cpp +++ b/src/Model/Model_ResultField.cpp @@ -45,7 +45,7 @@ std::shared_ptr Model_ResultField::shape() for(int a = 0; a < aResults; a++) { ResultBodyPtr aBody = std::dynamic_pointer_cast( document()->object(ModelAPI_ResultBody::group(), a)); - if (!aBody.get()) + if (!aBody.get()) continue; // check that only results that were created before this field are used FeaturePtr aResultFeature = document()->feature(aBody); diff --git a/src/Model/Model_SelectionNaming.cpp b/src/Model/Model_SelectionNaming.cpp index 47b530460..abaad4b2f 100644 --- a/src/Model/Model_SelectionNaming.cpp +++ b/src/Model/Model_SelectionNaming.cpp @@ -75,7 +75,7 @@ std::string Model_SelectionNaming::getShapeName( TNaming_Iterator anItL(aNS); for(int i = 1; anItL.More(); anItL.Next(), i++) { // in #1766 IsEqual produced no index of the face - if(anItL.NewShape().IsSame(theShape)) { + if(anItL.NewShape().IsSame(theShape)) { aName += aPostFix; aName += TCollection_AsciiString (i).ToCString(); break; diff --git a/src/ModelAPI/ModelAPI_AttributeTables.h b/src/ModelAPI/ModelAPI_AttributeTables.h index 253489785..072dc2fd0 100644 --- a/src/ModelAPI/ModelAPI_AttributeTables.h +++ b/src/ModelAPI/ModelAPI_AttributeTables.h @@ -18,7 +18,7 @@ /// /// The type of values can be changed. But all the values in the tables must have the same one /// type. The currently allowed types now are: Boolean, Integer, Double, String. -/// By default there is only one table, but it may be increased/decreased by adding/removing +/// By default there is only one table, but it may be increased/decreased by adding/removing /// tables one by one. /// The number of rows and columns are equal in all tables. If table, row or column is added, /// the previous values are kept unchanged. New cells are filled by zero, false or empty strings. diff --git a/src/ModelAPI/ModelAPI_Events.cpp b/src/ModelAPI/ModelAPI_Events.cpp index 9284b18af..00c74c8df 100644 --- a/src/ModelAPI/ModelAPI_Events.cpp +++ b/src/ModelAPI/ModelAPI_Events.cpp @@ -166,8 +166,8 @@ bool ModelAPI_ParameterEvalMessage::isProcessed() return myIsProcessed; } -const std::list >& - ModelAPI_ParameterEvalMessage::params() const +const std::list >& + ModelAPI_ParameterEvalMessage::params() const { return myParamsList; } diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp index 119a0a1eb..c431fc9b6 100644 --- a/src/ModelHighAPI/ModelHighAPI_Tools.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Tools.cpp @@ -211,7 +211,7 @@ void fillAttribute(const std::list & theValue, int anIndex = 0; for (auto it = theValue.begin(); it != theValue.end(); ++it, ++anIndex) - theAttribute->setValue(anIndex, *it); + theAttribute->setValue(anIndex, *it); } //-------------------------------------------------------------------------------------- diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.h b/src/ModelHighAPI/ModelHighAPI_Tools.h index fc59e5edc..7b58282d5 100644 --- a/src/ModelHighAPI/ModelHighAPI_Tools.h +++ b/src/ModelHighAPI/ModelHighAPI_Tools.h @@ -140,10 +140,10 @@ GeomAPI_Shape::ShapeType shapeTypeByStr(std::string theShapeTypeStr); MODELHIGHAPI_EXPORT GeomAPI_Shape::ShapeType getShapeType(const ModelHighAPI_Selection& theSelection); -MODELHIGHAPI_EXPORT +MODELHIGHAPI_EXPORT ModelAPI_AttributeTables::ValueType valueTypeByStr(const std::string& theValueTypeStr); -MODELHIGHAPI_EXPORT +MODELHIGHAPI_EXPORT std::string strByValueType(const ModelAPI_AttributeTables::ValueType theType); /// Performs the high level API dump, then closes all and executes the script: diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp index f028edefc..0d61bec9f 100644 --- a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp +++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp @@ -94,7 +94,7 @@ std::string ParametersPlugin_EvalListener::renameInPythonExpression( std::string anExpressionString = theExpression; // ask interpreter to compute the positions in the expression - std::shared_ptr aMsg = + std::shared_ptr aMsg = ModelAPI_ComputePositionsMessage::send(theExpression, theOldName, this); const std::list >& aPositions = aMsg->positions(); diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 54ada4890..24953f5a6 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -490,7 +490,7 @@ void PartSet_MenuMgr::activatePartSet() const SessionPtr aMgr = ModelAPI_Session::get(); bool isNewTransaction = !aMgr->isOperation(); // activation may cause changes in current features in document, so it must be in transaction - if (isNewTransaction) + if (isNewTransaction) aMgr->startOperation("Activation"); aMgr->setActiveDocument(aMgr->moduleDocument()); if (isNewTransaction) aMgr->finishOperation(); -- 2.30.2