Fix compiler warnings

wwmayer · Jun 2, 2024 · 2671482 · 2671482
1 parent 859d47b
commit 2671482
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
@@ -2840,7 +2840,7 @@ void PropertyMaterialList::setDiffuseColors(const std::vector<App::Color>& color
     aboutToSetValue();
     setSize(colors.size(), _lValueList[0]);
 
-    for (int i = 0; i < colors.size(); i++) {
+    for (std::size_t i = 0; i < colors.size(); i++) {
         _lValueList[i].diffuseColor = colors[i];
     }
     hasSetValue();

diff --git a/src/Gui/DlgMaterialPropertiesImp.cpp b/src/Gui/DlgMaterialPropertiesImp.cpp
@@ -229,7 +229,7 @@ void DlgMaterialPropertiesImp::onShininessValueChanged(int sh)
 /**
  * Reset the colors to the Coin3D defaults
  */
-void DlgMaterialPropertiesImp::onButtonReset(bool checked)
+void DlgMaterialPropertiesImp::onButtonReset()
 {
     for (std::vector<ViewProvider*>::iterator it = Objects.begin(); it != Objects.end(); ++it) {
         App::Property* prop = (*it)->getPropertyByName(material.c_str());
@@ -257,7 +257,7 @@ void DlgMaterialPropertiesImp::onButtonReset(bool checked)
 /**
  * Reset the colors to the current default
  */
-void DlgMaterialPropertiesImp::onButtonDefault(bool checked)
+void DlgMaterialPropertiesImp::onButtonDefault()
 {
     for (std::vector<ViewProvider*>::iterator it = Objects.begin(); it != Objects.end(); ++it) {
         App::Property* prop = (*it)->getPropertyByName(material.c_str());

diff --git a/src/Gui/DlgMaterialPropertiesImp.h b/src/Gui/DlgMaterialPropertiesImp.h
@@ -27,6 +27,7 @@
 #include <QDialog>
 #include <memory>
 #include <vector>
+#include <FCGlobal.h>
 
 namespace App
 {
@@ -63,8 +64,8 @@ class GuiExport DlgMaterialPropertiesImp: public QDialog
     void onEmissiveColorChanged();
     void onSpecularColorChanged();
     void onShininessValueChanged(int);
-    void onButtonReset(bool checked);
-    void onButtonDefault(bool checked);
+    void onButtonReset();
+    void onButtonDefault();
     void setButtonColors();
 
 protected:

diff --git a/src/Mod/Material/Gui/AppearancePreview.cpp b/src/Mod/Material/Gui/AppearancePreview.cpp
@@ -257,7 +257,9 @@ void AppearancePreview::setTexture(const QImage& image)
 }
 
 void AppearancePreview::setTextureScaling(double scale)
-{}
+{
+    Q_UNUSED(scale)
+}
 
 void AppearancePreview::resetAmbientColor()
 {

diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp
@@ -898,7 +898,7 @@ bool MaterialsEditor::updateTexturePreview() const
 {
     bool hasImage = false;
     QImage image;
-    double scaling = 99.0;
+    //double scaling = 99.0;
     if (_material->hasModel(Materials::ModelUUIDs::ModelUUID_Rendering_Texture)) {
         // First try loading an embedded image
         try {
@@ -939,7 +939,7 @@ bool MaterialsEditor::updateTexturePreview() const
         try {
             auto property = _material->getAppearanceProperty(QLatin1String("TextureScaling"));
             if (!property->isNull()) {
-                scaling = property->getFloat();
+                //scaling = property->getFloat();
                 // Base::Console().Log("Has 'TextureScaling' = %g\n", scaling);
             }
         }