member m_altColor made private

jmeidow · jmeidow · commit 254ecfaa9195 · 2026-03-03T11:50:16.000+01:00
diff --git a/src/qconstraints.cpp b/src/qconstraints.cpp
@@ -36,7 +36,6 @@
 #include <Eigen/Core>
 
 #include <cassert>
-#include <cfloat>
 #include <cmath>
 #include <memory>
 
@@ -71,14 +70,12 @@ QConstraintBase::QConstraintBase()
 }
 
 QConstraintBase::QConstraintBase(const QConstraintBase &other)
-    : // QGraphicsItem(),
-    m_altColor(other.m_altColor)
-    , m_pen_req(other.m_pen_req)
+    : m_pen_req(other.m_pen_req)
     , m_pen_red(other.m_pen_red)
     , m_is_required(other.m_is_required)
     , m_is_enforced(other.m_is_enforced)
+    , m_altColor(other.m_altColor)
 {
-    // qDebug() << Q_FUNC_INFO << m_sc;
     setVisible( s_show);
 
     setFlag(ItemIsSelectable, true);
@@ -215,7 +212,7 @@ void QAligned::paint( QPainter *painter,
     }
 
     if ( showColor() ) {
-        pen.setColor( m_altColor);
+        pen.setColor( altColor() );
     }
 
     painter->setPen( pen );
@@ -306,7 +303,7 @@ void QOrthogonal::paint( QPainter *painter,
     }
 
     if ( showColor() ) {
-        pen.setColor( m_altColor);
+        pen.setColor( altColor() );
     }
 
     painter->setPen( pen );
@@ -422,7 +419,7 @@ void QCopunctual::paint( QPainter *painter,
     QPen pen = QPen( required() ? m_pen_req : m_pen_red);
 
     if ( showColor()) {
-        pen.setColor( m_altColor);
+        pen.setColor( altColor() );
     }
     if ( !enforced() ) {
         pen.setColor(Qt::red);
@@ -541,7 +538,7 @@ void QParallel::paint( QPainter *painter,
     QPen pen = QPen( required() ? m_pen_req : m_pen_red);
 
     if ( showColor() ) {
-        pen.setColor( m_altColor);
+        pen.setColor( altColor() );
     }
 
     if ( !enforced() ) {
diff --git a/src/qconstraints.h b/src/qconstraints.h
@@ -73,6 +73,7 @@ class QConstraintBase : public QGraphicsItem
     void setLineWidth( int w);       //!< Set line width
     void setLineStyle( int s);       //!< Set line style
     void setAltColor( const QColor &col ); //!< Set color for automatic colorization
+    [[nodiscard]] QColor altColor() const {return m_altColor;}
     void setStatus( bool isrequired, bool isenforced);      //!< Set status
 
     virtual void setMarkerSize ( qreal s) = 0;  //!< Set marker size
@@ -111,7 +112,6 @@ class QConstraintBase : public QGraphicsItem
     static QPen s_defaultPenRed;      //!< Default pen for redundant constraints
     static QPen s_penSelected;        //!< Pen for selection
 
-    QColor m_altColor;        //!< Color for automatic colorization (subtasks)
     QPen m_pen_req;           //!< Pen for required constraint
     QPen m_pen_red;           //!< Pen for redundant constraint
 
@@ -126,6 +126,8 @@ class QConstraintBase : public QGraphicsItem
     bool m_is_required = true;    //!< Constraint is required? (for painting)
     bool m_is_enforced = false;   //!< Constraint is enforced? (for painting)
 
+    QColor m_altColor;   //!< Color for automatic colorization of subtasks
+
     static bool s_showColor;
     static bool s_show;
 };
