Attachment #79938 for bug #123042

View | Details | Raw Unified | Return to bug 123042
Collapse All | Expand All

Lines 163-169 Link Here

(-)foo/rosegarden-4-1.0/base/Colour.C (-1 / +1 lines)
163	// Generic Colour routines:	163	// Generic Colour routines:
164		164
165	Colour	165	Colour
166	Rosegarden::getCombinationColour(const Colour &input1, const Colour &input2)	166	getCombinationColour(const Colour &input1, const Colour &input2)
167	{	167	{
168	Colour ret((input1.getRed()+input2.getRed())/2,	168	Colour ret((input1.getRed()+input2.getRed())/2,
169	(input1.getGreen()+input2.getGreen())/2,	169	(input1.getGreen()+input2.getGreen())/2,

Lines 24-29 Link Here

(-)foo/rosegarden-4-1.0/gui/qcanvasgroupableitem.h (+2 lines)
24		24
25	#include <qcanvas.h>	25	#include <qcanvas.h>
26		26
		27	class QCanvasItemGroup;
		28
27	/**	29	/**
28	* This class is meant to be inherited by QCanvasItem children to make	30	* This class is meant to be inherited by QCanvasItem children to make
29	* them groupable.	31	* them groupable.

Lines 41-46 Link Here

(-)foo/rosegarden-4-1.0/gui/segmenttool.h (+2 lines)
41		41
42	namespace Rosegarden { class RulerScale; }	42	namespace Rosegarden { class RulerScale; }
43		43
		44	class SegmentToolBox;
		45
44	//////////////////////////////////////////////////////////////////////	46	//////////////////////////////////////////////////////////////////////
45	// Segment Tools	47	// Segment Tools
46	//////////////////////////////////////////////////////////////////////	48	//////////////////////////////////////////////////////////////////////

Return to bug 123042