diff --git a/Fwk/AppFwk/cafCommand/cafCmdFeatureManager.cpp b/Fwk/AppFwk/cafCommand/cafCmdFeatureManager.cpp index faab9bc2fb..adeb24134c 100644 --- a/Fwk/AppFwk/cafCommand/cafCmdFeatureManager.cpp +++ b/Fwk/AppFwk/cafCommand/cafCmdFeatureManager.cpp @@ -159,7 +159,7 @@ void CmdFeatureManager::refreshStates(const QStringList& commandIdList) { if (commandIdList.size() == 0) { - for (int i = 0; i < m_commandFeatures.size(); i++) + for (size_t i = 0; i < m_commandFeatures.size(); i++) { CmdFeature* cmdFeature = m_commandFeatures[i]; @@ -192,7 +192,7 @@ void CmdFeatureManager::refreshEnabledState(const QStringList& commandIdList) { if (commandIdList.size() == 0) { - for (int i = 0; i < m_commandFeatures.size(); i++) + for (size_t i = 0; i < m_commandFeatures.size(); i++) { m_commandFeatures[i]->refreshEnabledState(); } @@ -218,7 +218,7 @@ void CmdFeatureManager::refreshCheckedState(const QStringList& commandIdList) { if (commandIdList.size() == 0) { - for (int i = 0; i < m_commandFeatures.size(); i++) + for (size_t i = 0; i < m_commandFeatures.size(); i++) { m_commandFeatures[i]->refreshCheckedState(); } diff --git a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp index 30e4ad5c52..179ca4e118 100644 --- a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp +++ b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp @@ -76,7 +76,7 @@ void CmdUiCommandSystemImpl::fieldChangedCommand(PdmFieldHandle* editorField, co std::vector items; SelectionManager::instance()->selectedItems(items, SelectionManager::CURRENT); - for (int i = 0; i < items.size(); i++) + for (size_t i = 0; i < items.size(); i++) { PdmObjectHandle* objectHandle = dynamic_cast(items[i]); if (objectHandle) @@ -106,7 +106,7 @@ void CmdUiCommandSystemImpl::fieldChangedCommand(PdmFieldHandle* editorField, co std::vector commands; - for (int i = 0; i < fieldsToUpdate.size(); i++) + for (size_t i = 0; i < fieldsToUpdate.size(); i++) { PdmFieldHandle* field = fieldsToUpdate[i]; PdmUiFieldHandle* uiFieldHandle = field->uiCapability(); diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index e80d6cfc94..6be4d2ef14 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -11,30 +11,39 @@ include_directories( ${cafProjectDataModel_SOURCE_DIR} ${cafUserInterface_SOURCE_DIR} - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} + ${cafPdmCore_SOURCE_DIR} + ${cafPdmUiCore_SOURCE_DIR} ) add_library( ${PROJECT_NAME} - cafPdmCoreColor3f.h - cafPdmUiCoreColor3f.cpp - cafPdmUiCoreColor3f.h - cafPdmXmlColor3f.cpp - cafPdmXmlColor3f.h - cafPdmFieldCvfColor.h - - cafPdmCoreVec3d.h - cafPdmUiCoreVec3d.cpp - cafPdmUiCoreVec3d.h - cafPdmXmlVec3d.cpp - cafPdmXmlVec3d.h - cafPdmFieldCvfVec3d.h + cafPdmCoreColor3f.h + cafPdmUiCoreColor3f.cpp + cafPdmUiCoreColor3f.h + cafPdmXmlColor3f.cpp + cafPdmXmlColor3f.h + cafPdmFieldCvfColor.h - cafPdmCoreMat4d.h - # cafPdmUiCoreVec3d.cpp no special editor for matrix is created yet - cafPdmUiCoreMat4d.h - cafPdmXmlMat4d.cpp - cafPdmXmlMat4d.h - cafPdmFieldCvfMat4d.h + cafPdmCoreVec3d.h + cafPdmUiCoreVec3d.cpp + cafPdmUiCoreVec3d.h + cafPdmXmlVec3d.cpp + cafPdmXmlVec3d.h + cafPdmFieldCvfVec3d.h + + cafPdmCoreMat4d.h + # cafPdmUiCoreVec3d.cpp no special editor for matrix is created yet + cafPdmUiCoreMat4d.h + cafPdmXmlMat4d.cpp + cafPdmXmlMat4d.h + cafPdmFieldCvfMat4d.h +) + +target_link_libraries ( ${PROJECT_NAME} + cafPdmCore + cafPdmUiCore + cafUserInterface + cafProjectDataModel + LibCore + ${QT_LIBRARIES} ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h index a9067db6e4..57e36e1bb3 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h @@ -23,7 +23,7 @@ public: virtual size_t size() const = 0; virtual bool empty() const = 0; virtual void clear() = 0; - virtual void insertAt(size_t indexAfter, PdmObjectHandle* obj) = 0; + virtual void insertAt(int indexAfter, PdmObjectHandle* obj) = 0; virtual void erase(size_t index) = 0; virtual void deleteAllChildObjects() = 0; @@ -63,7 +63,7 @@ public: virtual bool empty() const { return m_pointers.empty(); } virtual void clear(); virtual void deleteAllChildObjects(); - virtual void insertAt(size_t indexAfter, PdmObjectHandle* obj); + virtual void insertAt(int indexAfter, PdmObjectHandle* obj); // std::vector-like access diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl index 3ad3ef09a6..37ed647492 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl @@ -148,8 +148,15 @@ void PdmChildArrayField::erase(size_t index) template size_t PdmChildArrayField::index(DataType* pointer) { - typename std::vector< PdmPointer >::iterator it = std::find(m_pointers.begin(), m_pointers.end(), pointer); - return it - m_pointers.begin(); + for (size_t i = 0; i < m_pointers.size(); ++i) + { + if (pointer == m_pointers[i].p()) + { + return i; + } + } + + return (size_t)(-1); // Undefined size_t > m_pointers.size(); } @@ -198,7 +205,7 @@ void PdmChildArrayField::childObjects(std::vector* /// //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::insertAt(size_t indexAfter, PdmObjectHandle* obj) +void PdmChildArrayField::insertAt(int indexAfter, PdmObjectHandle* obj) { // This method should assert if obj to insert is not castable to the container type, but since this // is a virtual method, its implementation is always created and that makes a dyn_cast add the need for diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h index 79339ecbbe..f8bc217ca5 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h @@ -91,7 +91,12 @@ private: friend class PdmPointerImpl; std::set m_pointersReferencingMe; }; +} +#include "cafPdmFieldHandle.h" + +namespace caf +{ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.cpp index 68a895e3d1..cb9faac98d 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.cpp @@ -174,7 +174,7 @@ void SelectionManager::setSelectionFromReferences(const std::vector& re { std::vector uiItems; - for (int i = 0; i < referenceList.size(); i++) + for (size_t i = 0; i < referenceList.size(); i++) { QString reference = referenceList[i]; @@ -197,7 +197,7 @@ void SelectionManager::setSelectionFromReferences(const std::vector& re //-------------------------------------------------------------------------------------------------- void SelectionManager::clearAll() { - for (int i = 0; i < m_selectionForRole.size(); i++) + for (size_t i = 0; i < m_selectionForRole.size(); i++) { m_selectionForRole[i].clear(); } @@ -250,7 +250,7 @@ void SelectionManager::removeObjectFromAllSelections(PdmObjectHandle* pdmObject) { bool doNotifySelectionChanged = false; - for (int role = 0; role < m_selectionForRole.size(); role++) + for (size_t role = 0; role < m_selectionForRole.size(); role++) { std::vector< std::pair, PdmUiItem*> >& selection = m_selectionForRole[role]; diff --git a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt index 8cee0d3d82..2191abfeb1 100644 --- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt @@ -29,7 +29,6 @@ set( QOBJECT_HEADERS cafPdmUiListView.h cafPdmUiListViewEditor.h cafPdmUiPropertyView.h - cafPdmUiPropertyViewDialog.h cafPdmUiPushButtonEditor.h cafPdmUiSliderEditor.h cafPdmUiTableView.h @@ -37,7 +36,7 @@ set( QOBJECT_HEADERS cafPdmUiTableViewEditor.h cafPdmUiTableViewModel.h cafPdmUiTextEditor.h - cafPdmUiToolButtonEditor.h + cafPdmUiToolButtonEditor.h cafPdmUiTreeView.h cafPdmUiTreeViewModel.h cafPdmUiTreeViewEditor.h diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp index 892772ba9c..715bdaf3b9 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp @@ -290,7 +290,7 @@ bool PdmUiLineEditor::isMultipleFieldsWithSameKeywordSelected(PdmFieldHandle* ed std::vector items; SelectionManager::instance()->selectedItems(items, SelectionManager::CURRENT); - for (int i = 0; i < items.size(); i++) + for (size_t i = 0; i < items.size(); i++) { PdmUiFieldHandle* uiField = dynamic_cast(items[i]); if (!uiField) continue; diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.cpp index f42a33f3d4..5d054eefde 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.cpp @@ -412,7 +412,7 @@ PdmFieldHandle* PdmUiTableViewModel::getField(const QModelIndex &index) const m_pdmList->childObjects(&listObjects); } - if (index.row() < listObjects.size()) + if (index.row() < static_cast(listObjects.size())) { PdmObjectHandle* pdmObject = listObjects[index.row()]; if (pdmObject) @@ -421,7 +421,7 @@ PdmFieldHandle* PdmUiTableViewModel::getField(const QModelIndex &index) const pdmObject->fields(fields); int fieldIndex = m_modelColumnIndexToFieldIndex[index.column()]; - if (fieldIndex < fields.size()) + if (fieldIndex < static_cast(fields.size())) { return fields[fieldIndex]; } @@ -530,7 +530,7 @@ PdmObjectHandle* PdmUiTableViewModel::pdmObjectForRow(int row) const m_pdmList->childObjects(&listObjects); } - if (row < listObjects.size()) + if (row < static_cast(listObjects.size())) { return listObjects[row]; } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp index d32ede3686..d8c0e170e3 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp @@ -170,9 +170,9 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName) } assert(m_fields.size() == m_fieldViews.size()); - assert(m_fields.size() == m_actions.size()); + assert(static_cast(m_fields.size()) == m_actions.size()); - for (int i = 0; i < m_fields.size(); i++) + for (size_t i = 0; i < m_fields.size(); i++) { caf::PdmFieldHandle* field = m_fields[i];