[composer] Fix restoration of grid color alpha channel from 2.4 projects

nyalldawson · nyalldawson · commit 70d58577607a · 2014-07-19T22:52:14.000+10:00
diff --git a/src/core/composer/qgscomposertable.cpp b/src/core/composer/qgscomposertable.cpp
@@ -313,7 +313,8 @@ bool QgsComposerTable::tableReadXML( const QDomElement& itemElem, const QDomDocu
     int gridRed = itemElem.attribute( "gridColorRed", "0" ).toInt();
     int gridGreen = itemElem.attribute( "gridColorGreen", "0" ).toInt();
     int gridBlue = itemElem.attribute( "gridColorBlue", "0" ).toInt();
-    mGridColor = QColor( gridRed, gridGreen, gridBlue );
+    int gridAlpha = itemElem.attribute( "gridColorAlpha", "255" ).toInt();
+    mGridColor = QColor( gridRed, gridGreen, gridBlue, gridAlpha );
   }
 
   //restore column specifications

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,8 @@ bool QgsComposerTable::tableReadXML( const QDomElement& itemElem, const QDomDocu`
`313`	`313`	`int gridRed = itemElem.attribute( "gridColorRed", "0" ).toInt();`
`314`	`314`	`int gridGreen = itemElem.attribute( "gridColorGreen", "0" ).toInt();`
`315`	`315`	`int gridBlue = itemElem.attribute( "gridColorBlue", "0" ).toInt();`
`316`		`- mGridColor = QColor( gridRed, gridGreen, gridBlue );`
	`316`	`+ int gridAlpha = itemElem.attribute( "gridColorAlpha", "255" ).toInt();`
	`317`	`+ mGridColor = QColor( gridRed, gridGreen, gridBlue, gridAlpha );`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`//restore column specifications`