diff --git a/src/Mod/Material/App/MaterialValue.h b/src/Mod/Material/App/MaterialValue.h index 8f1559ed31..ceaaf2682f 100644 --- a/src/Mod/Material/App/MaterialValue.h +++ b/src/Mod/Material/App/MaterialValue.h @@ -58,7 +58,7 @@ public: }; MaterialValue(); MaterialValue(const MaterialValue& other); - MaterialValue(ValueType type); + explicit MaterialValue(ValueType type); virtual ~MaterialValue() = default; MaterialValue& operator=(const MaterialValue& other); diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp index 2ea280d8c4..050b2147f6 100644 --- a/src/Mod/Material/App/Materials.cpp +++ b/src/Mod/Material/App/Materials.cpp @@ -457,11 +457,11 @@ Material::Material(const Material& other) _allUuids.push_back(*it); } for (auto it = other._physical.begin(); it != other._physical.end(); it++) { - MaterialProperty prop = it->second; + MaterialProperty prop(it->second); _physical[it->first] = std::make_shared(prop); } for (auto it = other._appearance.begin(); it != other._appearance.end(); it++) { - MaterialProperty prop = it->second; + MaterialProperty prop(it->second); _appearance[it->first] = std::make_shared(prop); } } @@ -1330,12 +1330,12 @@ Material& Material::operator=(const Material& other) // Create copies of the properties rather than modify the originals _physical.clear(); for (auto it = other._physical.begin(); it != other._physical.end(); it++) { - MaterialProperty prop = it->second; + MaterialProperty prop(it->second); _physical[it->first] = std::make_shared(prop); } _appearance.clear(); for (auto it = other._appearance.begin(); it != other._appearance.end(); it++) { - MaterialProperty prop = it->second; + MaterialProperty prop(it->second); _appearance[it->first] = std::make_shared(prop); } diff --git a/src/Mod/Material/App/Materials.h b/src/Mod/Material/App/Materials.h index 6dc24622c6..0749c6684f 100644 --- a/src/Mod/Material/App/Materials.h +++ b/src/Mod/Material/App/Materials.h @@ -47,9 +47,9 @@ class MaterialsExport MaterialProperty: public ModelProperty public: MaterialProperty(); - MaterialProperty(const ModelProperty& property); MaterialProperty(const MaterialProperty& property); - MaterialProperty(std::shared_ptr property); + explicit MaterialProperty(const ModelProperty& property); + explicit MaterialProperty(std::shared_ptr property); ~MaterialProperty() override = default; MaterialValue::ValueType getType() const diff --git a/src/Mod/Material/Gui/ArrayModel.h b/src/Mod/Material/Gui/ArrayModel.h index 739bd6524d..303e94c6f6 100644 --- a/src/Mod/Material/Gui/ArrayModel.h +++ b/src/Mod/Material/Gui/ArrayModel.h @@ -38,7 +38,7 @@ namespace MatGui class AbstractArrayModel: public QAbstractTableModel { public: - AbstractArrayModel(QObject* parent = nullptr); + explicit AbstractArrayModel(QObject* parent = nullptr); ~AbstractArrayModel() override = default; virtual bool newRow(const QModelIndex& index) const = 0; @@ -47,9 +47,9 @@ public: class Array2DModel: public AbstractArrayModel { public: - Array2DModel(std::shared_ptr property = nullptr, - std::shared_ptr value = nullptr, - QObject* parent = nullptr); + explicit Array2DModel(std::shared_ptr property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); ~Array2DModel() override = default; // Overridden virtual functions @@ -77,9 +77,9 @@ private: class Array3DDepthModel: public AbstractArrayModel { public: - Array3DDepthModel(std::shared_ptr property = nullptr, - std::shared_ptr value = nullptr, - QObject* parent = nullptr); + explicit Array3DDepthModel(std::shared_ptr property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); ~Array3DDepthModel() override = default; // Overridden virtual functions @@ -111,9 +111,9 @@ private: class Array3DModel: public AbstractArrayModel { public: - Array3DModel(std::shared_ptr property = nullptr, - std::shared_ptr value = nullptr, - QObject* parent = nullptr); + explicit Array3DModel(std::shared_ptr property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); ~Array3DModel() override = default; // Overridden virtual functions diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.h b/src/Mod/Material/Gui/DlgSettingsMaterial.h index 183bfd555f..4f62921794 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.h +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.h @@ -35,7 +35,7 @@ class DlgSettingsMaterial: public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgSettingsMaterial(QWidget* parent = nullptr); + explicit DlgSettingsMaterial(QWidget* parent = nullptr); ~DlgSettingsMaterial() override = default; protected: diff --git a/src/Mod/Material/Gui/MaterialDelegate.h b/src/Mod/Material/Gui/MaterialDelegate.h index a395fa8d9f..294c520fd3 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.h +++ b/src/Mod/Material/Gui/MaterialDelegate.h @@ -40,7 +40,7 @@ class MaterialDelegate: public QStyledItemDelegate { Q_OBJECT public: - MaterialDelegate(QObject* parent = nullptr); + explicit MaterialDelegate(QObject* parent = nullptr); ~MaterialDelegate() override = default; QWidget* createEditor(QWidget* parent, diff --git a/src/Mod/Material/Gui/MaterialSave.h b/src/Mod/Material/Gui/MaterialSave.h index 620c21ba70..9e173104cc 100644 --- a/src/Mod/Material/Gui/MaterialSave.h +++ b/src/Mod/Material/Gui/MaterialSave.h @@ -42,7 +42,7 @@ class MaterialSave: public QDialog Q_OBJECT public: - MaterialSave(std::shared_ptr material, QWidget* parent = nullptr); + explicit MaterialSave(std::shared_ptr material, QWidget* parent = nullptr); ~MaterialSave() override; void setLibraries(); diff --git a/src/Mod/Material/Gui/MaterialsEditor.h b/src/Mod/Material/Gui/MaterialsEditor.h index 33f03b221d..1addd48314 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.h +++ b/src/Mod/Material/Gui/MaterialsEditor.h @@ -46,7 +46,7 @@ class MaterialsEditor: public QDialog Q_OBJECT public: - MaterialsEditor(QWidget* parent = nullptr); + explicit MaterialsEditor(QWidget* parent = nullptr); ~MaterialsEditor() override = default; void onName(const QString& text); diff --git a/src/Mod/Material/Gui/ModelSelect.h b/src/Mod/Material/Gui/ModelSelect.h index 758bdda304..c316cf5414 100644 --- a/src/Mod/Material/Gui/ModelSelect.h +++ b/src/Mod/Material/Gui/ModelSelect.h @@ -44,8 +44,8 @@ class ModelSelect: public QDialog Q_OBJECT public: - ModelSelect(QWidget* parent = nullptr, - Materials::ModelFilter filter = Materials::ModelFilter_None); + explicit ModelSelect(QWidget* parent = nullptr, + Materials::ModelFilter filter = Materials::ModelFilter_None); ~ModelSelect() override; void onURL(bool checked);