more C++11 specifier

This commit is contained in:
Uwe Rathmann 2020-05-03 14:01:41 +02:00
parent 4bc74e02df
commit 0fa33f6061
2 changed files with 34 additions and 42 deletions

View File

@ -5,11 +5,6 @@
#include "QskPainterCommand.h"
QskPainterCommand::QskPainterCommand()
: m_type( Invalid )
{
}
QskPainterCommand::QskPainterCommand( const QPainterPath& path )
: m_type( Path )
{
@ -114,7 +109,7 @@ QskPainterCommand& QskPainterCommand::operator=( const QskPainterCommand& other
return *this;
}
bool QskPainterCommand::operator==( const QskPainterCommand& other ) const
bool QskPainterCommand::operator==( const QskPainterCommand& other ) const noexcept
{
if ( m_type != other.m_type )
return false;
@ -293,22 +288,22 @@ void QskPainterCommand::reset()
m_type = Invalid;
}
QPainterPath* QskPainterCommand::path()
QPainterPath* QskPainterCommand::path() noexcept
{
return m_path;
}
QskPainterCommand::PixmapData* QskPainterCommand::pixmapData()
QskPainterCommand::PixmapData* QskPainterCommand::pixmapData() noexcept
{
return m_pixmapData;
}
QskPainterCommand::ImageData* QskPainterCommand::imageData()
QskPainterCommand::ImageData* QskPainterCommand::imageData() noexcept
{
return m_imageData;
}
QskPainterCommand::StateData* QskPainterCommand::stateData()
QskPainterCommand::StateData* QskPainterCommand::stateData() noexcept
{
return m_stateData;
}

View File

@ -53,39 +53,30 @@ class QSK_EXPORT QskPainterCommand
};
//! Attributes of a state change
class StateData
struct StateData
{
public:
StateData()
: backgroundMode( Qt::TransparentMode )
, clipOperation( Qt::NoClip )
, isClipEnabled( false )
, compositionMode( QPainter::CompositionMode_SourceOver )
{
}
QPaintEngine::DirtyFlags flags;
QPen pen;
QBrush brush;
QPointF brushOrigin;
QBrush backgroundBrush;
Qt::BGMode backgroundMode;
Qt::BGMode backgroundMode = Qt::TransparentMode;
QFont font;
QMatrix matrix;
QTransform transform;
Qt::ClipOperation clipOperation;
Qt::ClipOperation clipOperation = Qt::NoClip;
QRegion clipRegion;
QPainterPath clipPath;
bool isClipEnabled;
bool isClipEnabled = false;
QPainter::RenderHints renderHints;
QPainter::CompositionMode compositionMode;
QPainter::CompositionMode compositionMode = QPainter::CompositionMode_SourceOver;
qreal opacity;
};
QskPainterCommand();
constexpr QskPainterCommand() noexcept;
QskPainterCommand( const QskPainterCommand& );
explicit QskPainterCommand( const QPainterPath& );
@ -104,22 +95,22 @@ class QSK_EXPORT QskPainterCommand
QskPainterCommand& operator=( const QskPainterCommand& );
bool operator==( const QskPainterCommand& other ) const;
bool operator!=( const QskPainterCommand& other ) const;
bool operator==( const QskPainterCommand& other ) const noexcept;
bool operator!=( const QskPainterCommand& other ) const noexcept;
Type type() const;
Type type() const noexcept;
QPainterPath* path();
const QPainterPath* path() const;
QPainterPath* path() noexcept;
const QPainterPath* path() const noexcept;
PixmapData* pixmapData();
const PixmapData* pixmapData() const;
PixmapData* pixmapData() noexcept;
const PixmapData* pixmapData() const noexcept;
ImageData* imageData();
const ImageData* imageData() const;
ImageData* imageData() noexcept;
const ImageData* imageData() const noexcept;
StateData* stateData();
const StateData* stateData() const;
StateData* stateData() noexcept;
const StateData* stateData() const noexcept;
private:
void copy( const QskPainterCommand& );
@ -136,40 +127,46 @@ class QSK_EXPORT QskPainterCommand
};
};
inline bool QskPainterCommand::operator!=( const QskPainterCommand& other ) const
constexpr inline QskPainterCommand::QskPainterCommand() noexcept
: m_type( Invalid )
, m_path( nullptr )
{
}
inline bool QskPainterCommand::operator!=( const QskPainterCommand& other ) const noexcept
{
return !( *this == other );
}
//! \return Type of the command
inline QskPainterCommand::Type QskPainterCommand::type() const
inline QskPainterCommand::Type QskPainterCommand::type() const noexcept
{
return m_type;
}
//! \return Painter path to be painted
inline const QPainterPath* QskPainterCommand::path() const
inline const QPainterPath* QskPainterCommand::path() const noexcept
{
return m_path;
}
//! \return Attributes how to paint a QPixmap
inline const QskPainterCommand::PixmapData*
QskPainterCommand::pixmapData() const
QskPainterCommand::pixmapData() const noexcept
{
return m_pixmapData;
}
//! \return Attributes how to paint a QImage
inline const QskPainterCommand::ImageData*
QskPainterCommand::imageData() const
QskPainterCommand::imageData() const noexcept
{
return m_imageData;
}
//! \return Attributes of a state change
inline const QskPainterCommand::StateData*
QskPainterCommand::stateData() const
QskPainterCommand::stateData() const noexcept
{
return m_stateData;
}