OS X compile fix

baldurk · baldurk · commit 608cd152d906 · 2017-07-28T20:31:52.000+01:00
diff --git a/qrenderdoc/Styles/RDStyle/RDStyle.cpp b/qrenderdoc/Styles/RDStyle/RDStyle.cpp
@@ -948,7 +948,7 @@ void RDStyle::drawComplexControl(ComplexControl control, const QStyleOptionCompl
       }
     }
 
-    int activeHover = State_MouseOver | State_Active | State_Enabled;
+    QStyle::State activeHover = State_MouseOver | State_Active | State_Enabled;
     if((opt->state & activeHover) == activeHover)
     {
       QRect hoverRect =
@@ -1534,7 +1534,7 @@ void RDStyle::drawControl(ControlElement control, const QStyleOption *opt, QPain
 
     p->setPen(QPen(outlineBrush(opt->palette), 1.0));
 
-    int mask = State_Enabled | State_Selected;
+    QStyle::State mask = State_Enabled | State_Selected;
     if((opt->state & mask) == mask)
     {
       qreal radius = 2.0;
@@ -1577,7 +1577,7 @@ void RDStyle::drawControl(ControlElement control, const QStyleOption *opt, QPain
 
     p->setPen(QPen(outlineBrush(opt->palette), 1.0));
 
-    int mask = State_Enabled | State_Selected;
+    QStyle::State mask = State_Enabled | State_Selected;
     if((opt->state & mask) == mask)
     {
       qreal radius = 2.0;

Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ void RDStyle::drawComplexControl(ComplexControl control, const QStyleOptionCompl`
`948`	`948`	`}`
`949`	`949`	`}`
`950`	`950`
`951`		`- int activeHover = State_MouseOver \| State_Active \| State_Enabled;`
	`951`	`+ QStyle::State activeHover = State_MouseOver \| State_Active \| State_Enabled;`
`952`	`952`	`if((opt->state & activeHover) == activeHover)`
`953`	`953`	`{`
`954`	`954`	`QRect hoverRect =`
`@@ -1534,7 +1534,7 @@ void RDStyle::drawControl(ControlElement control, const QStyleOption *opt, QPain`
`1534`	`1534`
`1535`	`1535`	`p->setPen(QPen(outlineBrush(opt->palette), 1.0));`
`1536`	`1536`
`1537`		`- int mask = State_Enabled \| State_Selected;`
	`1537`	`+ QStyle::State mask = State_Enabled \| State_Selected;`
`1538`	`1538`	`if((opt->state & mask) == mask)`
`1539`	`1539`	`{`
`1540`	`1540`	`qreal radius = 2.0;`
`@@ -1577,7 +1577,7 @@ void RDStyle::drawControl(ControlElement control, const QStyleOption *opt, QPain`
`1577`	`1577`
`1578`	`1578`	`p->setPen(QPen(outlineBrush(opt->palette), 1.0));`
`1579`	`1579`
`1580`		`- int mask = State_Enabled \| State_Selected;`
	`1580`	`+ QStyle::State mask = State_Enabled \| State_Selected;`
`1581`	`1581`	`if((opt->state & mask) == mask)`
`1582`	`1582`	`{`
`1583`	`1583`	`qreal radius = 2.0;`