From e53e231677ce1f8ed2da0ede98a324b097d80641 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 24 Jun 2022 14:48:52 +0200
Subject: [PATCH] Gui: remove some superfluous const_cast

---
 src/Gui/CallTips.cpp                   |  2 +-
 src/Gui/CallTips.h                     |  2 +-
 src/Gui/Macro.cpp                      |  6 +++---
 src/Gui/Quarter/SoQTQuarterAdaptor.cpp |  2 +-
 src/Gui/ReportView.cpp                 | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp
index 541a2ce0f2..c01b3b103d 100644
--- a/src/Gui/CallTips.cpp
+++ b/src/Gui/CallTips.cpp
@@ -292,7 +292,7 @@ QMap<QString, CallTip> CallTipsList::extractTips(const QString& context) const
         // If we have an instance of PyObjectBase then determine whether it's valid or not
         if (PyObject_IsInstance(inst.ptr(), typeobj) == 1) {
             Base::PyObjectBase* baseobj = static_cast<Base::PyObjectBase*>(inst.ptr());
-            const_cast<CallTipsList*>(this)->validObject = baseobj->isValid();
+            validObject = baseobj->isValid();
         }
         else {
             // PyObject_IsInstance might set an exception
diff --git a/src/Gui/CallTips.h b/src/Gui/CallTips.h
index d74a251b9e..5853408145 100644
--- a/src/Gui/CallTips.h
+++ b/src/Gui/CallTips.h
@@ -80,7 +80,7 @@ private:
 private:
     QPlainTextEdit* textEdit;
     int cursorPos;
-    bool validObject;
+    mutable bool validObject;
     bool doCallCompletion;
     QList<int> hideKeys;
     QList<int> compKeys;
diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp
index 9d5fc5a711..35a415701e 100644
--- a/src/Gui/Macro.cpp
+++ b/src/Gui/Macro.cpp
@@ -239,15 +239,15 @@ namespace Gui {
         {
             if (out) {
                 Base::PyGILStateLocker lock;
-                old = PySys_GetObject(const_cast<char*>(std_out));
-                PySys_SetObject(const_cast<char*>(std_out), out);
+                old = PySys_GetObject(std_out);
+                PySys_SetObject(std_out, out);
             }
         }
         ~PythonRedirector()
         {
             if (out) {
                 Base::PyGILStateLocker lock;
-                PySys_SetObject(const_cast<char*>(std_out), old);
+                PySys_SetObject(std_out, old);
                 Py_DECREF(out);
             }
         }
diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
index 16a57a8fa1..c86ae53314 100644
--- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
@@ -203,7 +203,7 @@ QWidget* SIM::Coin3D::Quarter::SoQTQuarterAdaptor::getWidget() const
 
 QWidget* SIM::Coin3D::Quarter::SoQTQuarterAdaptor::getGLWidget() const
 {
-    return const_cast<QWidget*>(viewport());
+    return viewport();
 }
 
 void SIM::Coin3D::Quarter::SoQTQuarterAdaptor::setCameraType(SoType type)
diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp
index c4881ca263..1fba55c188 100644
--- a/src/Gui/ReportView.cpp
+++ b/src/Gui/ReportView.cpp
@@ -345,14 +345,14 @@ public:
     {
         if (!default_stdout) {
             Base::PyGILStateLocker lock;
-            default_stdout = PySys_GetObject(const_cast<char*>("stdout"));
+            default_stdout = PySys_GetObject("stdout");
             replace_stdout = new OutputStdout();
             redirected_stdout = false;
         }
 
         if (!default_stderr) {
             Base::PyGILStateLocker lock;
-            default_stderr = PySys_GetObject(const_cast<char*>("stderr"));
+            default_stderr = PySys_GetObject("stderr");
             replace_stderr = new OutputStderr();
             redirected_stderr = false;
         }
@@ -712,12 +712,12 @@ void ReportOutput::onToggleRedirectPythonStdout()
     if (d->redirected_stdout) {
         d->redirected_stdout = false;
         Base::PyGILStateLocker lock;
-        PySys_SetObject(const_cast<char*>("stdout"), d->default_stdout);
+        PySys_SetObject("stdout", d->default_stdout);
     }
     else {
         d->redirected_stdout = true;
         Base::PyGILStateLocker lock;
-        PySys_SetObject(const_cast<char*>("stdout"), d->replace_stdout);
+        PySys_SetObject("stdout", d->replace_stdout);
     }
 
     getWindowParameter()->SetBool("RedirectPythonOutput", d->redirected_stdout);
@@ -728,12 +728,12 @@ void ReportOutput::onToggleRedirectPythonStderr()
     if (d->redirected_stderr) {
         d->redirected_stderr = false;
         Base::PyGILStateLocker lock;
-        PySys_SetObject(const_cast<char*>("stderr"), d->default_stderr);
+        PySys_SetObject("stderr", d->default_stderr);
     }
     else {
         d->redirected_stderr = true;
         Base::PyGILStateLocker lock;
-        PySys_SetObject(const_cast<char*>("stderr"), d->replace_stderr);
+        PySys_SetObject("stderr", d->replace_stderr);
     }
 
     getWindowParameter()->SetBool("RedirectPythonErrors", d->redirected_stderr);