From 31eb13e16d38a312111fac869fefa90e4d0d1604 Mon Sep 17 00:00:00 2001
From: Bruno <bruno.herbelin@gmail.com>
Date: Sun, 18 Apr 2021 10:58:03 +0200
Subject: [PATCH] Unused =operator: copy function instead

---
 ImageProcessingShader.cpp | 7 +------
 ImageProcessingShader.h   | 3 +--
 ImageShader.cpp           | 8 ++------
 ImageShader.h             | 4 ++--
 Shader.cpp                | 2 +-
 Shader.h                  | 3 +--
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ImageProcessingShader.cpp b/ImageProcessingShader.cpp
index 6375b5c..489ce07 100644
--- a/ImageProcessingShader.cpp
+++ b/ImageProcessingShader.cpp
@@ -58,7 +58,7 @@ void ImageProcessingShader::reset()
 
 }
 
-void ImageProcessingShader::copy(const ImageProcessingShader &S)
+void ImageProcessingShader::copy(ImageProcessingShader const& S)
 {
     brightness = S.brightness;
     contrast = S.contrast;
@@ -75,11 +75,6 @@ void ImageProcessingShader::copy(const ImageProcessingShader &S)
     chromadelta = S.chromadelta;
 }
 
-void ImageProcessingShader::operator = (const ImageProcessingShader &S )
-{
-    copy(S);
-}
-
 
 void ImageProcessingShader::accept(Visitor& v)
 {
diff --git a/ImageProcessingShader.h b/ImageProcessingShader.h
index 0c185c1..ee43981 100644
--- a/ImageProcessingShader.h
+++ b/ImageProcessingShader.h
@@ -16,8 +16,7 @@ public:
     void reset() override;
     void accept(Visitor& v) override;
 
-    void operator = (const ImageProcessingShader &S);
-    void copy(const ImageProcessingShader &S);
+    void copy(ImageProcessingShader const& S);
 
     // color effects
     float brightness; // [-1 1]
diff --git a/ImageShader.cpp b/ImageShader.cpp
index b799b72..9a2e8f8 100644
--- a/ImageShader.cpp
+++ b/ImageShader.cpp
@@ -58,10 +58,8 @@ void ImageShader::reset()
     stipple = 0.f;
 }
 
-void ImageShader::operator = (const ImageShader &S)
+void ImageShader::copy(ImageShader const& S)
 {
-    Shader::operator =(S);
-
     mask_texture = S.mask_texture;
     stipple = S.stipple;
 }
@@ -133,10 +131,8 @@ void MaskShader::reset()
     effect = 0;
 }
 
-void MaskShader::operator = (const MaskShader &S)
+void MaskShader::copy(MaskShader const& S)
 {
-    Shader::operator =(S);
-
     mode = S.mode;
     shape = S.shape;
     blur = S.blur;
diff --git a/ImageShader.h b/ImageShader.h
index 8992f85..251d81f 100644
--- a/ImageShader.h
+++ b/ImageShader.h
@@ -19,7 +19,7 @@ public:
     void use() override;
     void reset() override;
     void accept(Visitor& v) override;
-    void operator = (const ImageShader &S);
+    void copy(ImageShader const& S);
 
     uint mask_texture;
 
@@ -45,7 +45,7 @@ public:
     void use() override;
     void reset() override;
     void accept(Visitor& v) override;
-    void operator = (const MaskShader &S);
+    void copy(MaskShader const& S);
 
     enum Modes {
         NONE = 0,
diff --git a/Shader.cpp b/Shader.cpp
index 482d74d..39f0aa9 100644
--- a/Shader.cpp
+++ b/Shader.cpp
@@ -210,7 +210,7 @@ Shader::Shader() : blending(BLEND_OPACITY)
 }
 
 
-void Shader::operator = (const Shader &S )
+void Shader::copy(Shader const& S)
 {
     color = S.color;
     blending = S.blending;
diff --git a/Shader.h b/Shader.h
index 4ae850c..8b18b41 100644
--- a/Shader.h
+++ b/Shader.h
@@ -50,8 +50,7 @@ public:
     virtual void use();
     virtual void reset();
     virtual void accept(Visitor& v);
-
-    void operator = (const Shader &D );
+    void copy(Shader const& S);
 
     glm::mat4 projection;
     glm::mat4 modelview;