From fe66b9905707860d91de347ae84885a93f4aad2c Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 22 Sep 2020 13:21:26 +0200 Subject: [PATCH] avoid "Rectangle" name conflicts --- playground/grids/GridSkinny.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playground/grids/GridSkinny.cpp b/playground/grids/GridSkinny.cpp index af9c1389..e8292d63 100644 --- a/playground/grids/GridSkinny.cpp +++ b/playground/grids/GridSkinny.cpp @@ -10,10 +10,10 @@ namespace { - class Rectangle : public QskControl + class ColoredRectangle : public QskControl { public: - Rectangle( const QByteArray& colorName ) + ColoredRectangle( const QByteArray& colorName ) : m_colorName( colorName ) { setObjectName( colorName ); @@ -57,7 +57,7 @@ GridSkinny::~GridSkinny() void GridSkinny::insert( const QByteArray& colorName, int row, int column, int rowSpan, int columnSpan ) { - m_grid->addItem( new Rectangle( colorName ), + m_grid->addItem( new ColoredRectangle( colorName ), row, column, rowSpan, columnSpan ); }