[Uml-devel] branches/work/soc-umbrello/umbrello/widgets

[Andi Fischer]

SVN commit 1295077 by fischer:

Differences to trunk reduced.

 M  +20 -20    widgetbase.cpp  
 M  +5 -5      widgetbase.h  


--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.cpp #1295076:1295077
@@ -441,13 +441,13 @@
     return m_usesDiagramLineColor;
 }
 
-void WidgetBase::setUsesDiagramLineColor(bool status)
+void WidgetBase::setUsesDiagramLineColor(bool state)
 {
-    if (m_usesDiagramLineColor == status) {
+    if (m_usesDiagramLineColor == state) {
         return;
     }
-    m_usesDiagramLineColor = status;
-    if (status && umlScene()) {
+    m_usesDiagramLineColor = state;
+    if (state && umlScene()) {
         QColor color = umlScene()->lineColor();
         if (color != lineColor()) {
             setLineColor(color);
@@ -460,13 +460,13 @@
     return m_usesDiagramLineWidth;
 }
 
-void WidgetBase::setUsesDiagramLineWidth(bool status)
+void WidgetBase::setUsesDiagramLineWidth(bool state)
 {
-    if (m_usesDiagramLineWidth == status) {
+    if (m_usesDiagramLineWidth == state) {
         return;
     }
-    m_usesDiagramLineWidth = status;
-    if (status && umlScene()) {
+    m_usesDiagramLineWidth = state;
+    if (state && umlScene()) {
         uint lw = umlScene()->lineWidth();
         if (lw != lineWidth()) {
             setLineWidth(lw);
@@ -479,13 +479,13 @@
     return m_usesDiagramBrush;
 }
 
-void WidgetBase::setUsesDiagramBrush(bool status)
+void WidgetBase::setUsesDiagramBrush(bool state)
 {
-    if (status == m_usesDiagramBrush) {
+    if (state == m_usesDiagramBrush) {
         return;
     }
-    m_usesDiagramBrush = status;
-    if (status && umlScene()) {
+    m_usesDiagramBrush = state;
+    if (state && umlScene()) {
         QBrush b = umlScene()->brush();
         if (b != brush()) {
             setBrush(b);
@@ -498,13 +498,13 @@
     return m_usesDiagramFont;
 }
 
-void WidgetBase::setUsesDiagramFont(bool status)
+void WidgetBase::setUsesDiagramFont(bool state)
 {
-    if (status == m_usesDiagramFont) {
+    if (state == m_usesDiagramFont) {
         return;
     }
-    m_usesDiagramFont = status;
-    if (status && umlScene()) {
+    m_usesDiagramFont = state;
+    if (state && umlScene()) {
         QFont f = umlScene()->font();
         if (f != font()) {
             setFont(f);
@@ -517,13 +517,13 @@
     return m_usesDiagramTextColor;
 }
 
-void WidgetBase::setUsesDiagramTextColor(bool status)
+void WidgetBase::setUsesDiagramTextColor(bool state)
 {
-    if (m_usesDiagramTextColor == status) {
+    if (m_usesDiagramTextColor == state) {
         return;
     }
-    m_usesDiagramTextColor = status;
-    if (status && umlScene()) {
+    m_usesDiagramTextColor = state;
+    if (state && umlScene()) {
         QColor color = umlScene()->textColor();
         if (color != textColor()) {
             setTextColor(color);
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.h #1295076:1295077
@@ -162,19 +162,19 @@
     void setBrush(const QBrush& brush);
 
     bool usesDiagramLineColor() const;
-    void setUsesDiagramLineColor(bool status);
+    void setUsesDiagramLineColor(bool state);
 
     bool usesDiagramLineWidth() const;
-    void setUsesDiagramLineWidth(bool status);
+    void setUsesDiagramLineWidth(bool state);
 
     bool usesDiagramBrush() const;
-    void setUsesDiagramBrush(bool status);
+    void setUsesDiagramBrush(bool state);
 
     bool usesDiagramFont() const;
-    void setUsesDiagramFont(bool status);
+    void setUsesDiagramFont(bool state);
 
     bool usesDiagramTextColor() const;
-    void setUsesDiagramTextColor(bool status);
+    void setUsesDiagramTextColor(bool state);
 
     QFont font() const;
     void setFont(const QFont& font);