avoid "Rectangle" name conflicts
This commit is contained in:
parent
31244327f2
commit
fe66b99057
@ -10,10 +10,10 @@
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
class Rectangle : public QskControl
|
class ColoredRectangle : public QskControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Rectangle( const QByteArray& colorName )
|
ColoredRectangle( const QByteArray& colorName )
|
||||||
: m_colorName( colorName )
|
: m_colorName( colorName )
|
||||||
{
|
{
|
||||||
setObjectName( colorName );
|
setObjectName( colorName );
|
||||||
@ -57,7 +57,7 @@ GridSkinny::~GridSkinny()
|
|||||||
void GridSkinny::insert( const QByteArray& colorName,
|
void GridSkinny::insert( const QByteArray& colorName,
|
||||||
int row, int column, int rowSpan, int columnSpan )
|
int row, int column, int rowSpan, int columnSpan )
|
||||||
{
|
{
|
||||||
m_grid->addItem( new Rectangle( colorName ),
|
m_grid->addItem( new ColoredRectangle( colorName ),
|
||||||
row, column, rowSpan, columnSpan );
|
row, column, rowSpan, columnSpan );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user