peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uncrustified

Browse Source
This commit is contained in:
Uwe Rathmann 2020-12-05 15:09:31 +01:00
parent 6281c43dda
commit fbf2a33a9a
47 changed files with 189 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
examples/gallery/progressbar/ProgressBarPage.cpp
View File

@ -14,31 +14,31 @@
namespace
{
class ProgressBar : public QskProgressBar
{
public:
ProgressBar( QskLinearBox* box )
: QskProgressBar( box )
{
setOrientation( ( box->orientation() == Qt::Horizontal )
? Qt::Vertical : Qt::Horizontal );
setBoundaries( 0, 100 );
}
void setTheme( QskRgbPalette::Theme theme )
{
const auto pal = QskRgbPalette::palette( theme );
QVector< QRgb > rgb;
rgb += pal.rgb( QskRgbPalette::W200 );
rgb += pal.rgb( QskRgbPalette::W400 );
rgb += pal.rgb( QskRgbPalette::W600 );
rgb += pal.rgb( QskRgbPalette::W900 );
const auto stops = QskRgbPalette::colorStops( rgb, true );
setBarGradient( QskGradient( orientation(), stops ) );
}
{
public:
ProgressBar( QskLinearBox* box )
: QskProgressBar( box )
{
setOrientation( ( box->orientation() == Qt::Horizontal )
? Qt::Vertical : Qt::Horizontal );
setBoundaries( 0, 100 );
}
void setTheme( QskRgbPalette::Theme theme )
{
const auto pal = QskRgbPalette::palette( theme );
QVector< QRgb > rgb;
rgb += pal.rgb( QskRgbPalette::W200 );
rgb += pal.rgb( QskRgbPalette::W400 );
rgb += pal.rgb( QskRgbPalette::W600 );
rgb += pal.rgb( QskRgbPalette::W900 );
const auto stops = QskRgbPalette::colorStops( rgb, true );
setBarGradient( QskGradient( orientation(), stops ) );
}
};
}

6
examples/gallery/slider/SliderPage.cpp
View File

@ -59,8 +59,8 @@ void SliderPage::populate()
{
auto slider = new QskSlider( Qt::Vertical, hBox );
slider->setMinimum( 0 );
slider->setMinimum( 0 );
slider->setMaximum( 1000 );
slider->setPageSize( 10 );
slider->setStepSize( 10 );
@ -70,7 +70,7 @@ void SliderPage::populate()
{
auto slider = new OtherSlider( hBox );
slider->setOrientation( Qt::Vertical );
slider->setMinimum( 0 );
slider->setMaximum( 10 );
slider->setStepSize( 1 );

4
examples/layouts/StackLayoutPage.cpp
View File

@ -81,7 +81,7 @@ namespace
Q_SIGNALS:
void transitionStarted( int ms );
private:
void addRectangle( const char* colorName )
{
@ -133,7 +133,7 @@ namespace
if ( m_elapsed.elapsed() >= m_duration )
reset();
else
setValue( m_elapsed.elapsed() / m_duration * 100.0 );
setValue( m_elapsed.elapsed() / m_duration * 100.0 );
}
private:

2
examples/tabview/main.cpp
View File

@ -63,7 +63,7 @@ class TabView : public QskTabView
{
if ( tabPosition() == pos[i] )
{
setTabPosition( pos[ ( i + 1 ) % 4 ] );
setTabPosition( pos[ ( i + 1 ) % 4 ] );
break;
}
}

4
examples/thumbnails/main.cpp
View File

@ -86,7 +86,7 @@ class Thumbnail : public QskPushButton
static_cast< SkinnyShapeFactory::Shape >( shape ), size );
QskGraphic graphic;
QPen pen( Qt::black, 3 );
pen.setJoinStyle( Qt::MiterJoin );
pen.setCosmetic( true );
@ -204,7 +204,7 @@ class ScrollArea : public QskScrollArea
setFlickRecognizerTimeout( 300 );
connect( this, &QskScrollView::scrollPosChanged,
this, &ScrollArea::updateVisibilities );
this, &ScrollArea::updateVisibilities );
}
protected:

6
playground/anchors/AnchorBox.cpp
View File

@ -384,9 +384,9 @@ QSizeF AnchorBox::layoutSizeHint( Qt::SizeHint which, const QSizeF& constraint )
void AnchorBox::updateHints()
{
/*
The solver seems to run into overflows with
std::numeric_limits< unsigned float >::max()
/*
The solver seems to run into overflows with
std::numeric_limits< unsigned float >::max()
*/
const qreal max = std::numeric_limits< unsigned int >::max();

10
playground/grids/main.cpp
View File

@ -326,10 +326,10 @@ void Box::test11()
void Box::test12()
{
/*
We have different strategies where to put the spaces, when
there is more space than the elements are willing to accept.
QSkinny has the extraSpacingAt parameter to control this.
/*
We have different strategies where to put the spaces, when
there is more space than the elements are willing to accept.
QSkinny has the extraSpacingAt parameter to control this.
*/
insert( "PaleVioletRed", 0, 0 );
@ -364,7 +364,7 @@ class MainWidget : public QWidget
/*
Not using layouts here to avoid confusion
while debugging.
*/
*/
const auto r = contentsRect();
const int spacing = 5;

49
playground/shadows/BoxShadowNode.cpp
View File

@ -11,15 +11,15 @@ namespace
{
class Shader final : public QSGMaterialShader
{
public:
public:
Shader();
char const *const *attributeNames() const override;
char const* const* attributeNames() const override;
void initialize() override;
void updateState( const QSGMaterialShader::RenderState &state,
QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
void updateState( const QSGMaterialShader::RenderState& state,
QSGMaterial* newMaterial, QSGMaterial* oldMaterial) override;
private:
int m_matrixLocation = -1;
@ -32,10 +32,10 @@ namespace
};
class Material final : public QSGMaterial
{
{
public:
Material();
QSGMaterialShader* createShader() const override;
QSGMaterialType* type() const override;
@ -47,7 +47,7 @@ namespace
QVector4D radius = QVector4D{0.0, 0.0, 0.0, 0.0};
QColor color = Qt::black;
QVector2D offset;
};
};
Shader::Shader()
{
@ -55,14 +55,14 @@ namespace
setShaderSourceFile( QOpenGLShader::Vertex, root + "boxshadow.vert" );
setShaderSourceFile( QOpenGLShader::Fragment, root + "boxshadow.frag" );
}
}
char const* const* Shader::attributeNames() const
{
static char const *const names[] = { "in_vertex", "in_coord", nullptr };
static char const* const names[] = { "in_vertex", "in_coord", nullptr };
return names;
}
void Shader::initialize()
{
QSGMaterialShader::initialize();
@ -78,20 +78,20 @@ namespace
m_colorLocation = p->uniformLocation( "color" );
}
void Shader::updateState( const QSGMaterialShader::RenderState &state,
QSGMaterial *newMaterial, QSGMaterial *oldMaterial )
void Shader::updateState( const QSGMaterialShader::RenderState& state,
QSGMaterial* newMaterial, QSGMaterial* oldMaterial )
{
auto p = program();
if ( state.isMatrixDirty() )
p->setUniformValue(m_matrixLocation, state.combinedMatrix());
if ( state.isMatrixDirty() )
p->setUniformValue(m_matrixLocation, state.combinedMatrix() );
if ( state.isOpacityDirty() )
p->setUniformValue(m_opacityLocation, state.opacity());
p->setUniformValue(m_opacityLocation, state.opacity() );
if ( oldMaterial == nullptr || newMaterial->compare( oldMaterial ) != 0 )
{
auto material = static_cast< const Material* >(newMaterial);
auto material = static_cast< const Material* >( newMaterial );
p->setUniformValue( m_aspectLocation, material->aspect );
p->setUniformValue( m_extentLocation, material->extent );
@ -105,7 +105,7 @@ namespace
{
setFlag( QSGMaterial::Blending, true );
}
QSGMaterialShader* Material::createShader() const
{
return new Shader();
@ -165,7 +165,7 @@ void BoxShadowNode::setRect( const QRectF& rect )
{
Q_D( BoxShadowNode );
if ( rect == d->rect)
if ( rect == d->rect )
return;
d->rect = rect;
@ -173,7 +173,7 @@ void BoxShadowNode::setRect( const QRectF& rect )
QVector2D newAspect( 1.0, 1.0 );
if ( rect.width() >= rect.height() )
newAspect.setX( rect.width() / rect.height());
newAspect.setX( rect.width() / rect.height() );
else
newAspect.setY( rect.height() / rect.width() );
@ -188,7 +188,7 @@ void BoxShadowNode::setShape( const QskBoxShapeMetrics& shape )
{
Q_D( BoxShadowNode );
const float t = 0.5 * std::min( d->rect.width(), d->rect.height());
const float t = 0.5 * std::min( d->rect.width(), d->rect.height() );
const float r1 = shape.radius( Qt::BottomRightCorner ).width();
const float r2 = shape.radius( Qt::TopRightCorner ).width();
@ -216,7 +216,7 @@ void BoxShadowNode::setColor( const QColor& color )
const auto c = QColor::fromRgbF(
color.redF() * a, color.greenF() * a, color.blueF() * a, a );
if ( d->material.color != c )
if ( d->material.color != c )
{
d->material.color = c;
markDirty(QSGNode::DirtyMaterial);
@ -234,7 +234,7 @@ void BoxShadowNode::setShadow( qreal extent, qreal dx, qreal dy )
const float uniformExtent = ( extent / minDimension ) * 2.0;
if ( !qFuzzyCompare( d->material.extent, uniformExtent ) )
if ( !qFuzzyCompare( d->material.extent, uniformExtent ) )
{
d->material.extent = uniformExtent;
markDirty(QSGNode::DirtyMaterial);
@ -258,8 +258,7 @@ void BoxShadowNode::updateGeometry()
auto rect = d->rect.adjusted(
-sz * aspect.x(), -sz * aspect.y(),
sz * aspect.x(), sz * aspect.y()
);
sz * aspect.x(), sz * aspect.y() );
auto offsetLength = d->material.offset.length();

2
playground/shadows/BoxShadowNode.h
View File

@ -21,7 +21,7 @@ class BoxShadowNode : public QSGGeometryNode
void updateGeometry();
private:
private:
Q_DECLARE_PRIVATE( BoxShadowNode )
};

2
playground/shadows/ShadowedBox.cpp
View File

@ -80,7 +80,7 @@ namespace
QSK_SUBCONTROL( ShadowedBox, Panel )
ShadowedBox::ShadowedBox(QQuickItem *parentItem)
ShadowedBox::ShadowedBox( QQuickItem* parentItem )
: QskControl( parentItem )
{
setFlag( QQuickItem::ItemHasContents, true );

6
playground/shadows/ShadowedBox.h
View File

@ -10,7 +10,7 @@ class ShadowedBox : public QskControl
{
Q_OBJECT
public:
public:
QSK_SUBCONTROLS( Panel )
class Shadow
@ -21,7 +21,7 @@ public:
qreal yOffset = 0.0;
};
ShadowedBox(QQuickItem *parent = nullptr);
ShadowedBox(QQuickItem* parent = nullptr);
~ShadowedBox() override;
void setShadow( const Shadow& );
@ -36,7 +36,7 @@ public:
void setShape( const QskBoxShapeMetrics& );
const QskBoxShapeMetrics& shape() const;
private:
private:
Shadow m_shadow;
QColor m_shadowColor = Qt::black;
QskGradient m_gradient;

2
qmlexport/QskQml.cpp
View File

@ -91,7 +91,7 @@ namespace
private:
static void filter( QLoggingCategory *category )
static void filter( QLoggingCategory* category )
{
if ( qstrcmp( category->categoryName(), "qt.qml.typeregistration" ) == 0 )
{

6
skins/material/QskMaterialSkin.cpp
View File

@ -245,13 +245,13 @@ void QskMaterialSkin::initProgressBarHints()
const auto& pal = m_data->palette;
for ( auto subControl : { Q::Groove, Q::Bar } )
{
{
setMetric( subControl | Size, 5 );
setMargins( subControl | Padding, 0 );
setBoxShape( subControl, 0 );
setBoxBorderMetrics( subControl, 0 );
}
}
setGradient( Q::Groove, Grey );
setMetric( Q::Groove | Size, 5 );

2
src/common/QskAspect.h
View File

@ -560,7 +560,7 @@ QSK_EXPORT void qskDebugAspect( QDebug, const QMetaObject*, QskAspect::Aspect );
#define QSK_SYSTEM_STATE( type, name, value ) \
const QskAspect::State type::name = \
QskAspect::registerState( &type::staticMetaObject, value, #type "::" #name );
#if !defined( _MSC_VER )
#define QSK_SUBCONTROLS( ... ) static const QskAspect::Subcontrol __VA_ARGS__;

2
src/common/QskBoxShapeMetrics.cpp
View File

@ -133,7 +133,7 @@ QVariant QskBoxShapeMetrics::interpolate(
uint QskBoxShapeMetrics::hash( uint seed ) const noexcept
{
uint hash = qHash( static_cast<int>( m_sizeMode ), seed );
uint hash = qHash( static_cast< int >( m_sizeMode ), seed );
return qHashBits( m_radii, sizeof( m_radii ), hash );
}

2
src/common/QskGradient.cpp
View File

@ -139,7 +139,7 @@ static inline QVector< QskGradientStop > qskExtractedStops(
}
else
{
for ( i = 1 ; i < stops.count(); i++ )
for ( i = 1; i < stops.count(); i++ )
{
if ( stops[i].position() > from )
break;

8
src/common/QskIntervalF.cpp
View File

@ -25,12 +25,12 @@ QskIntervalF QskIntervalF::interpolated(
const QskIntervalF& to, qreal progress ) const noexcept
{
return qskInterpolated( *this, to, progress );
}
}
QVariant QskIntervalF::interpolate(
const QskIntervalF& intv1, const QskIntervalF& intv2, qreal progress ) noexcept
{
return QVariant::fromValue( qskInterpolated( intv1, intv2, progress ) );
{
return QVariant::fromValue( qskInterpolated( intv1, intv2, progress ) );
}
void QskIntervalF::unite( const QskIntervalF& other ) noexcept

2
src/common/QskMetaFunction.cpp
View File

@ -273,7 +273,7 @@ void QskMetaFunction::invoke( QObject* object,
types[ i ] = parameterTypes[ i - 1 ];
arguments[ i ] =
arguments[ i ] =
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
QMetaType( types[ i ] ).create( argv[ i ] );
#else

18
src/common/QskMetaFunction.hpp
View File

@ -11,7 +11,7 @@
class QskMetaFunction::FunctionCall : public QtPrivate::QSlotObjectBase
{
public:
public:
typedef void (* InvokeFunction)(
int which, QtPrivate::QSlotObjectBase*, QObject*, void**, bool* );
@ -33,7 +33,7 @@ public:
m_parameterTypes = types;
}
protected:
protected:
explicit inline FunctionCall( InvokeFunction f,
const int* m_parameterTypes = nullptr ):
QSlotObjectBase( f ),
@ -41,7 +41,7 @@ protected:
{
}
private:
private:
const int* m_parameterTypes; // static array, only needed for Qt::QueuedConnection
};
@ -55,7 +55,7 @@ namespace QskMetaFunctionCall
{
using MetaCall = StaticFunctionCall< Function, Args, R >;
public:
public:
explicit inline StaticFunctionCall( Function function ):
FunctionCall( &invoke ),
m_function( function )
@ -95,7 +95,7 @@ namespace QskMetaFunctionCall
}
}
private:
private:
Function m_function;
};
@ -104,7 +104,7 @@ namespace QskMetaFunctionCall
{
using MetaCall = MemberFunctionCall< Function, Args, R >;
public:
public:
explicit inline MemberFunctionCall( Function function ):
FunctionCall( &invoke ),
m_function( function )
@ -139,7 +139,7 @@ namespace QskMetaFunctionCall
}
}
private:
private:
Function m_function;
};
@ -148,7 +148,7 @@ namespace QskMetaFunctionCall
{
using MetaCall = FunctorFunctionCall< Function, N, Args, R >;
public:
public:
explicit inline FunctorFunctionCall( Function function ):
FunctionCall( &invoke ),
m_function( function )
@ -182,7 +182,7 @@ namespace QskMetaFunctionCall
}
}
private:
private:
Function m_function;
};
}

4
src/common/QskMetaInvokable.cpp
View File

@ -20,10 +20,10 @@ static void qskRegisterMetaInvokable()
{
qRegisterMetaType< QskMetaInvokable >();
}
Q_CONSTRUCTOR_FUNCTION( qskRegisterMetaInvokable )
static inline void *qskMetaTypeCreate( int type, const void *copy )
static inline void* qskMetaTypeCreate( int type, const void* copy )
{
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
return QMetaType( type ).create( copy );

2
src/common/QskRgbPalette.h
View File

@ -66,7 +66,7 @@ class QSK_EXPORT QskRgbPalette
{
if ( weight < 0 || weight >= NumWeights )
return 0;
return m_rgb[ weight ];
}

4
src/common/QskRgbValue.cpp
View File

@ -164,8 +164,8 @@ QRgb QskRgb::lighter( QRgb rgb, int factor ) noexcept
}
QRgb QskRgb::darker( QRgb rgb, int factor ) noexcept
{
if ( factor <= 0 )
{
if ( factor <= 0 )
return rgb;
// guess we can find a faster implementation without using QColor TODO ...

30
src/common/QskScaleEngine.cpp
View File

@ -15,7 +15,7 @@
#include <cmath>
namespace
namespace
{
// What about using qskFuzzyCompare and friends ???
@ -101,7 +101,7 @@ namespace
}
}
namespace
namespace
{
double minorStepSize( double intervalSize, int maxSteps )
{
@ -113,7 +113,7 @@ namespace
const int numTicks = qCeil( qAbs( intervalSize / minStep ) ) - 1;
// Do the minor steps fit into the interval?
if ( fuzzyCompare( ( numTicks + 1 ) * qAbs( minStep ),
if ( fuzzyCompare( ( numTicks + 1 ) * qAbs( minStep ),
qAbs( intervalSize ), intervalSize ) > 0 )
{
// The minor steps doesn't fit into the interval
@ -163,7 +163,7 @@ QskScaleTickmarks QskScaleEngine::divideScale(
const auto interval = QskIntervalF::normalized( x1, x2 );
if ( interval.width() > std::numeric_limits<qreal>::max() )
if ( interval.width() > std::numeric_limits< qreal >::max() )
{
qWarning() << "QskScaleEngine::divideScale: overflow";
return tickmarks;
@ -223,7 +223,7 @@ QskIntervalF QskScaleEngine::align( const QskIntervalF& interval, qreal stepSize
// when there is no rounding beside some effect, when
// calculating with doubles, we keep the original value
const auto max = std::numeric_limits<qreal>::max();
const auto max = std::numeric_limits< qreal >::max();
if ( -max + stepSize <= x1 )
{
@ -242,11 +242,11 @@ QskIntervalF QskScaleEngine::align( const QskIntervalF& interval, qreal stepSize
return QskIntervalF( x1, x2 );
}
QVector<qreal> QskScaleEngine::strip(
const QVector<qreal>& ticks, const QskIntervalF& interval ) const
QVector< qreal > QskScaleEngine::strip(
const QVector< qreal >& ticks, const QskIntervalF& interval ) const
{
if ( !interval.isValid() || ticks.count() == 0 )
return QVector<qreal>();
return QVector< qreal >();
if ( fuzzyContains( interval, ticks.first() )
&& fuzzyContains( interval, ticks.last() ) )
@ -254,7 +254,7 @@ QVector<qreal> QskScaleEngine::strip(
return ticks;
}
QVector<qreal> strippedTicks;
QVector< qreal > strippedTicks;
for ( int i = 0; i < ticks.count(); i++ )
{
if ( fuzzyContains( interval, ticks[i] ) )
@ -265,13 +265,13 @@ QVector<qreal> QskScaleEngine::strip(
}
QskScaleTickmarks QskScaleEngine::buildTicks(
const QskIntervalF &interval, qreal stepSize, int maxMinorSteps ) const
const QskIntervalF& interval, qreal stepSize, int maxMinorSteps ) const
{
using T = QskScaleTickmarks;
const auto boundingInterval = align( interval, stepSize );
QVector<qreal> ticks[3];
QVector< qreal > ticks[3];
ticks[T::MajorTick] = buildMajorTicks( boundingInterval, stepSize );
if ( maxMinorSteps > 0 )
@ -302,14 +302,14 @@ QskScaleTickmarks QskScaleEngine::buildTicks(
return tickmarks;
}
QVector<qreal> QskScaleEngine::buildMajorTicks(
QVector< qreal > QskScaleEngine::buildMajorTicks(
const QskIntervalF& interval, qreal stepSize ) const
{
int numTicks = qRound( interval.width() / stepSize ) + 1;
if ( numTicks > 10000 )
numTicks = 10000;
QVector<qreal> ticks;
QVector< qreal > ticks;
ticks.reserve( numTicks );
ticks += interval.lowerBound();
@ -321,8 +321,8 @@ QVector<qreal> QskScaleEngine::buildMajorTicks(
}
void QskScaleEngine::buildMinorTicks(
const QVector<qreal>& majorTicks, int maxMinorSteps, qreal stepSize,
QVector<qreal> &minorTicks, QVector<qreal> &mediumTicks ) const
const QVector< qreal >& majorTicks, int maxMinorSteps, qreal stepSize,
QVector< qreal >& minorTicks, QVector< qreal >& mediumTicks ) const
{
auto minStep = minorStepSize( stepSize, maxMinorSteps );
if ( minStep == 0.0 )

12
src/common/QskScaleEngine.h
View File

@ -38,21 +38,21 @@ class QSK_EXPORT QskScaleEngine
QskScaleTickmarks divideScale(qreal x1, qreal x2,
int maxMajorSteps, int maxMinorSteps, qreal stepSize = 0.0) const;
void autoScale( int maxNumSteps, qreal &x1, qreal &x2, qreal &stepSize ) const;
void autoScale( int maxNumSteps, qreal& x1, qreal& x2, qreal& stepSize ) const;
private:
QskIntervalF align( const QskIntervalF&, qreal stepSize ) const;
QVector<qreal> strip( const QVector<qreal>&, const QskIntervalF& ) const;
QVector< qreal > strip( const QVector< qreal >&, const QskIntervalF& ) const;
QskScaleTickmarks buildTicks(
const QskIntervalF&, qreal stepSize, int maxMinorSteps ) const;
QVector<qreal> buildMajorTicks( const QskIntervalF&, qreal stepSize ) const;
QVector< qreal > buildMajorTicks( const QskIntervalF&, qreal stepSize ) const;
void buildMinorTicks( const QVector<qreal>& majorTicks,
int maxMinorSteps, qreal stepSize, QVector<qreal>& minorTicks,
QVector<qreal>& mediumTicks ) const;
void buildMinorTicks( const QVector< qreal >& majorTicks,
int maxMinorSteps, qreal stepSize, QVector< qreal >& minorTicks,
QVector< qreal >& mediumTicks ) const;
Attributes m_attributes;
};

8
src/common/QskScaleTickmarks.cpp
View File

@ -26,12 +26,12 @@ int QskScaleTickmarks::tickCount( TickType type ) const noexcept
return m_ticks[ type ].count();
}
QVector<qreal> QskScaleTickmarks::ticks( TickType type ) const noexcept
QVector< qreal > QskScaleTickmarks::ticks( TickType type ) const noexcept
{
return m_ticks[ type ];
}
void QskScaleTickmarks::setTicks(TickType type, const QVector<qreal>& ticks )
void QskScaleTickmarks::setTicks(TickType type, const QVector< qreal >& ticks )
{
m_ticks[ type ] = ticks;
}
@ -44,7 +44,7 @@ void QskScaleTickmarks::reset()
}
void QskScaleTickmarks::invert()
{
{
std::reverse( m_ticks[ 0 ].begin(), m_ticks[ 0 ].end() );
std::reverse( m_ticks[ 1 ].begin(), m_ticks[ 1 ].end() );
std::reverse( m_ticks[ 2 ].begin(), m_ticks[ 2 ].end() );
@ -59,7 +59,7 @@ uint QskScaleTickmarks::hash( uint seed ) const
return seed;
}
bool QskScaleTickmarks::operator==( const QskScaleTickmarks &other ) const noexcept
bool QskScaleTickmarks::operator==( const QskScaleTickmarks& other ) const noexcept
{
return ( m_ticks[ 0 ] == other.m_ticks[ 0 ] )
&& ( m_ticks[ 1 ] == other.m_ticks[ 1 ] )

34
src/common/QskScaleTickmarks.h
View File

@ -13,9 +13,9 @@ class QSK_EXPORT QskScaleTickmarks
{
Q_GADGET
Q_PROPERTY( QVector<qreal> majorTicks READ majorTicks WRITE setMajorTicks )
Q_PROPERTY( QVector<qreal> mediumTicks READ mediumTicks WRITE setMediumTicks )
Q_PROPERTY( QVector<qreal> minorTicks READ minorTicks WRITE setMinorTicks )
Q_PROPERTY( QVector< qreal > majorTicks READ majorTicks WRITE setMajorTicks )
Q_PROPERTY( QVector< qreal > mediumTicks READ mediumTicks WRITE setMediumTicks )
Q_PROPERTY( QVector< qreal > minorTicks READ minorTicks WRITE setMinorTicks )
public:
enum TickType
@ -36,17 +36,17 @@ class QSK_EXPORT QskScaleTickmarks
int tickCount() const noexcept;
int tickCount( TickType ) const noexcept;
QVector<qreal> ticks( TickType ) const noexcept;
void setTicks( TickType, const QVector<qreal> & );
QVector< qreal > ticks( TickType ) const noexcept;
void setTicks( TickType, const QVector< qreal >& );
void setMinorTicks( const QVector<qreal>& );
QVector<qreal> minorTicks() const noexcept;
void setMinorTicks( const QVector< qreal >& );
QVector< qreal > minorTicks() const noexcept;
void setMediumTicks( const QVector<qreal>& );
QVector<qreal> mediumTicks() const noexcept;
void setMediumTicks( const QVector< qreal >& );
QVector< qreal > mediumTicks() const noexcept;
void setMajorTicks( const QVector<qreal>& );
QVector<qreal> majorTicks() const noexcept;
void setMajorTicks( const QVector< qreal >& );
QVector< qreal > majorTicks() const noexcept;
void invert();
void reset();
@ -57,32 +57,32 @@ class QSK_EXPORT QskScaleTickmarks
QVector< qreal > m_ticks[ 3 ];
};
inline void QskScaleTickmarks::setMinorTicks( const QVector<qreal>& ticks )
inline void QskScaleTickmarks::setMinorTicks( const QVector< qreal >& ticks )
{
setTicks( MinorTick, ticks );
}
inline QVector<qreal> QskScaleTickmarks::minorTicks() const noexcept
inline QVector< qreal > QskScaleTickmarks::minorTicks() const noexcept
{
return ticks( MinorTick );
}
inline void QskScaleTickmarks::setMediumTicks( const QVector<qreal>& ticks )
inline void QskScaleTickmarks::setMediumTicks( const QVector< qreal >& ticks )
{
setTicks( MediumTick, ticks );
}
inline QVector<qreal> QskScaleTickmarks::mediumTicks() const noexcept
inline QVector< qreal > QskScaleTickmarks::mediumTicks() const noexcept
{
return ticks( MediumTick );
}
inline void QskScaleTickmarks::setMajorTicks( const QVector<qreal>& ticks )
inline void QskScaleTickmarks::setMajorTicks( const QVector< qreal >& ticks )
{
setTicks( MajorTick, ticks );
}
inline QVector<qreal> QskScaleTickmarks::majorTicks() const noexcept
inline QVector< qreal > QskScaleTickmarks::majorTicks() const noexcept
{
return ticks( MajorTick );
}

4
src/common/QskShadowMetrics.cpp
View File

@ -41,7 +41,7 @@ QskShadowMetrics QskShadowMetrics::toAbsolute( const QSizeF& size ) const noexce
const qreal blurRadius = qskToAbsolute( length, m_spreadRadius );
const qreal dx = qskToAbsolute( size.width(), m_offset.x() );
const qreal dy = qskToAbsolute( size.height(), m_offset.x() );
return QskShadowMetrics( spreadRadius, blurRadius, QPointF( dx, dy ) );
}
@ -55,7 +55,7 @@ QskShadowMetrics QskShadowMetrics::interpolated(
qskInterpolated( m_offset.x(), to.m_offset.x(), ratio ),
qskInterpolated( m_offset.y(), to.m_offset.y(), ratio ) );
QskShadowMetrics metrics(
QskShadowMetrics metrics(
qskInterpolated( m_spreadRadius, to.m_spreadRadius, ratio ),
qskInterpolated( m_blurRadius, to.m_blurRadius, ratio ),
offset );

2
src/common/QskShadowMetrics.h
View File

@ -99,7 +99,7 @@ inline constexpr qreal QskShadowMetrics::spreadRadius() const noexcept
}
inline void QskShadowMetrics::setBlurRadius( qreal radius ) noexcept
{
{
m_blurRadius = radius;
}

4
src/common/QskSizePolicy.cpp
View File

@ -28,9 +28,9 @@ QskSizePolicy::ConstraintType QskSizePolicy::constraintType() const noexcept
if ( ( m_verticalPolicy & mask ) == ConstrainedFlag )
return QskSizePolicy::HeightForWidth;
return QskSizePolicy::Unconstrained;
}
}
Qt::SizeHint QskSizePolicy::effectiveSizeHintType(
Qt::SizeHint which, Qt::Orientation orientation ) const noexcept

2
src/controls/QskShortcutMap.cpp
View File

@ -252,7 +252,7 @@ bool QskShortcutHandler::eventFilter( QObject* object, QEvent* event )
Q_ASSERT( data.item == nullptr || data.item == object );
data.invoke( );
data.invoke();
return true;
}

2
src/controls/QskWindow.cpp
View File

@ -151,7 +151,7 @@ static inline QByteArray qskVisualizationMode( const QQuickWindow* window )
{
auto d = QQuickWindowPrivate::get( const_cast< QQuickWindow* >( window ) );
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
return d->visualizationMode;
return d->visualizationMode;
#else
return d->customRenderMode;
#endif

2
src/dialogs/QskDialogSubWindow.cpp
View File

@ -256,7 +256,7 @@ QskDialog::DialogCode QskDialogSubWindow::exec()
{
// when being called from QQuickWindow::mouseReleaseEvent
// the mouse grabber has not yet been released.
if( !qskIsAncestorOf( this, mouseGrabber ) )
mouseGrabber->ungrabMouse();
}

6
src/graphic/QskGraphic.cpp
View File

@ -676,7 +676,7 @@ void QskGraphic::render( QPainter* painter, const QRectF& rect,
}
const auto& pr = m_data->pointRect;
const auto rc = rect.center();
const auto rc = rect.center();
QTransform tr;
tr.translate(
@ -1025,7 +1025,7 @@ QDebug operator<<( QDebug debug, const QskGraphic& graphic )
debug << "\n Path(" << path.elementCount() << ")";
const char *types[] = { "MoveTo", "LineTo", "CurveTo", "CurveToData" };
const char* types[] = { "MoveTo", "LineTo", "CurveTo", "CurveToData" };
for ( int i = 0; i < path.elementCount(); i++ )
{
@ -1041,7 +1041,7 @@ QDebug operator<<( QDebug debug, const QskGraphic& graphic )
{
const auto& pixmapData = *command.pixmapData();
debug << "\n Pixmap:";
debug << "\n Pixmap:";
debug << "\n " << pixmapData.pixmap;
debug << "\n Rect:" << pixmapData.rect;
debug << "\n SubRect:" << pixmapData.subRect;

2
src/graphic/QskGraphicProvider.cpp
View File

@ -68,7 +68,7 @@ const QskGraphic* QskGraphicProvider::requestGraphic( const QString& id ) const
{
qWarning() << "QskGraphicProvider: can't load" << id;
return nullptr;
}
}
{
QMutexLocker locker( &m_data->mutex );

2
src/inputpanel/QskVirtualKeyboard.cpp
View File

@ -313,7 +313,7 @@ QSizeF QskVirtualKeyboard::layoutSizeHint(
const auto dh = padding.top() + padding.bottom();
w = ( h - dh ) / ratio + dw;
}
}
else
{
if ( w < 0 )

22
src/layouts/QskGridBox.cpp
View File

@ -105,21 +105,21 @@ QskGridBox::~QskGridBox()
for ( int i = 0; i < engine.count(); i++ )
{
if ( auto item = engine.itemAt( i ) )
setItemActive( item, false );
setItemActive( item, false );
}
}
int QskGridBox::addItem( QQuickItem* item,
int QskGridBox::addItem( QQuickItem* item,
int row, int column, Qt::Alignment alignment )
{
if ( auto control = qskControlCast( item ) )
{
if ( auto control = qskControlCast( item ) )
control->setLayoutAlignmentHint( alignment );
return addItem( item, row, column );
}
int QskGridBox::addItem( QQuickItem* item,
int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment )
}
int QskGridBox::addItem( QQuickItem* item,
int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment )
{
if ( auto control = qskControlCast( item ) )
control->setLayoutAlignmentHint( alignment );
@ -459,7 +459,7 @@ void QskGridBox::itemChange( ItemChange change, const ItemChangeData& value )
bool QskGridBox::event( QEvent* event )
{
switch ( static_cast<int>( event->type() ) )
switch ( static_cast< int >( event->type() ) )
{
case QEvent::LayoutRequest:
{
@ -492,10 +492,10 @@ void QskGridBox::dump()
QDebugStateSaver saver( debug );
debug.nospace();
const auto constraint = sizeConstraint();
debug << "QskGridBox"
debug << "QskGridBox"
<< "[" << engine.columnCount() << "," << engine.rowCount() << "] w:"
<< constraint.width() << " h:" << constraint.height() << '\n';

8
src/layouts/QskGridLayoutEngine.cpp
View File

@ -259,12 +259,12 @@ QskLayoutChain::CellData Element::cell( Qt::Orientation orientation ) const
{
QskLayoutChain::CellData cell;
cell.isValid = true;
if ( m_isSpacer )
{
const qreal value = ( orientation == Qt::Horizontal )
? m_spacing.width() : m_spacing.height();
cell.hint.setMinimum( value );
cell.hint.setPreferred( value );
cell.hint.setMaximum( value );
@ -434,7 +434,7 @@ bool QskGridLayoutEngine::setColumnSizeHint(
if ( !m_data->columnSettings.setHintAt( column, which, width ) )
return false;
if ( column >= m_data->columnCount )
if ( column >= m_data->columnCount )
m_data->columnCount = column + 1;
invalidate();
@ -635,7 +635,7 @@ void QskGridLayoutEngine::setupChain( Qt::Orientation orientation,
auto cell = element.cell( orientation );
if ( element.item() )
cell.hint = layoutHint( element.item(), orientation, constraint );
chain.expandCell( grid.top(), cell );
}
else

2
src/layouts/QskLayoutChain.cpp
View File

@ -156,7 +156,7 @@ void QskLayoutChain::expandCells(
cell.isValid = true;
m_validCells++;
}
}
}
}
void QskLayoutChain::finish()

4
src/layouts/QskLayoutEngine2D.cpp
View File

@ -400,7 +400,7 @@ QSizeF QskLayoutEngine2D::sizeHint(
if ( constraint.width() <= 0 )
requestType = QskSizePolicy::Unconstrained;
break;
}
case QskSizePolicy::WidthForHeight:
@ -430,7 +430,7 @@ QSizeF QskLayoutEngine2D::sizeHint(
#endif
}
}
}
}
auto& rowChain = m_data->rowChain;
auto& columnChain = m_data->columnChain;

12
src/layouts/QskLinearBox.cpp
View File

@ -237,7 +237,7 @@ void QskLinearBox::itemChange( ItemChange change, const ItemChangeData& value )
bool QskLinearBox::event( QEvent* event )
{
switch ( static_cast<int>( event->type() ) )
switch ( static_cast< int >( event->type() ) )
{
case QEvent::LayoutRequest:
{
@ -530,16 +530,16 @@ int QskLinearBox::stretchFactor( const QQuickItem* item ) const
}
void QskLinearBox::dump()
{
{
const auto& engine = m_data->engine;
auto debug = qDebug();
QDebugStateSaver saver( debug );
debug.nospace();
const auto constraint = sizeConstraint();
debug << "QskLinearBox" << engine.orientation()
<< " w:" << constraint.width() << " h:" << constraint.height() << '\n';

2
src/nodes/QskPlainTextRenderer.cpp
View File

@ -81,7 +81,7 @@ static qreal qskLayoutText( QTextLayout* layout,
with QTextOption::NoWrap - even if word wrapping
for elided text does not make any sense.
Needs some debugging of QTextLine::layout_helper, TODO ...
*/
*/
auto option = layout->textOption();
option.setWrapMode( QTextOption::WrapAnywhere );
layout->setTextOption( option );

4
src/nodes/QskSGNode.cpp
View File

@ -11,7 +11,7 @@ static inline void qskRemoveChildNode( QSGNode* parent, QSGNode* child )
if ( child->flags() & QSGNode::OwnedByParent )
delete child;
}
static inline void qskRemoveAllChildNodesAfter( QSGNode* parent, QSGNode* child )
@ -90,7 +90,7 @@ void QskSGNode::removeAllChildNodesAfter( QSGNode* parent, QSGNode* child )
}
void QskSGNode::removeAllChildNodesFrom( QSGNode* parent, QSGNode* child )
{
{
if ( parent && child && child->parent() == parent )
{
qskRemoveAllChildNodesAfter( parent, child );

14
src/nodes/QskScaleRenderer.cpp
View File

@ -30,14 +30,14 @@ static inline void qskInsertRemoveChild( QSGNode* parentNode,
return;
if ( oldNode )
{
{
parentNode->removeChildNode( oldNode );
if ( oldNode->flags() & QSGNode::OwnedByParent )
delete oldNode;
}
if ( newNode )
{
{
if ( append )
parentNode->appendChildNode( newNode );
else
@ -67,7 +67,7 @@ void QskScaleRenderer::setTickColor( const QColor& color )
void QskScaleRenderer::setTickWidth( qreal width )
{
m_tickWidth = width;
m_tickWidth = width;
}
void QskScaleRenderer::setFont( const QFont& font )
@ -139,10 +139,10 @@ QSGNode* QskScaleRenderer::updateTicksNode(
if( ticksNode == nullptr )
ticksNode = new QskTickmarksNode;
ticksNode->update( m_tickColor, rect, m_boundaries,
m_tickmarks, m_tickWidth, m_orientation );
return ticksNode;
}
@ -180,7 +180,7 @@ QSGNode* QskScaleRenderer::updateLabelsNode(
const qreal tickPos = ratio * ( tick - m_boundaries.lowerBound() );
if ( label.canConvert< QString >() )
if ( label.canConvert< QString >() )
{
const auto text = label.toString();
if ( text.isEmpty() )

2
src/nodes/QskScaleRenderer.h
View File

@ -42,7 +42,7 @@ class QSK_EXPORT QskScaleRenderer
const QRectF& tickmarksRect, const QRectF& labelsRect, QSGNode* );
virtual QVariant labelAt( qreal pos ) const;
qreal maxLabelWidth() const;
qreal maxLabelWidth() const;
virtual QSGNode* updateTicksNode(
const QskSkinnable*, const QRectF&, QSGNode* ) const;

2
src/nodes/QskTextureNode.cpp
View File

@ -39,7 +39,7 @@ static void qskUpdateGLTextureId( QRhiTexture* rhiTexture, uint textureId )
auto funcs = QOpenGLContext::currentContext()->functions();
funcs->glDeleteTextures( 1, &id );
}
auto glTexture = static_cast< Texture* >( rhiTexture );
glTexture->texture = textureId;

3
src/nodes/QskTextureRenderer.h
View File

@ -42,8 +42,7 @@ namespace QskTextureRenderer
virtual void paint( QPainter*, const QSize& ) = 0;
};
QSK_EXPORT uint createTexture(
RenderMode, const QSize&, PaintHelper* helper );
QSK_EXPORT uint createTexture( RenderMode, const QSize&, PaintHelper* );
QSK_EXPORT uint createTextureFromGraphic(
RenderMode, const QSize&, const QskGraphic&,

2
src/nodes/QskTickmarksNode.cpp
View File

@ -86,7 +86,7 @@ void QskTickmarksNode::update(
for( int i = TM::MinorTick; i <= TM::MajorTick; i++ )
{
const auto tickType = static_cast< TM::TickType >(i);
const auto tickType = static_cast< TM::TickType >( i );
const auto ticks = tickmarks.ticks( tickType );
if ( orientation == Qt::Horizontal )