From 4e54d1cb58775c54767d8bea66ab47a304f009ed Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 4 Jan 2019 13:42:16 +0100 Subject: [PATCH] uncrustified --- src/common/QskAspect.h | 8 ++++---- src/common/QskFlags.h | 2 +- src/common/QskGlobal.h | 4 ++-- src/common/QskGradient.cpp | 2 +- src/common/QskMetaFunction.cpp | 2 +- src/controls/QskBoxSkinlet.h | 2 +- src/controls/QskControl.cpp | 6 +++--- src/controls/QskControl.h | 2 +- src/controls/QskFocusIndicator.cpp | 4 ++-- src/controls/QskFocusIndicator.h | 2 +- src/controls/QskPageIndicatorSkinlet.cpp | 2 +- src/controls/QskPushButton.cpp | 4 ++-- src/controls/QskPushButton.h | 8 ++++---- src/controls/QskPushButtonSkinlet.cpp | 2 +- src/controls/QskQuick.h | 4 ++-- src/controls/QskScrollView.h | 2 +- src/controls/QskShortcutMap.h | 14 +++++++------- src/controls/QskSkin.h | 2 +- src/controls/QskSkinTransition.cpp | 2 +- src/controls/QskSubWindow.cpp | 2 +- src/controls/QskSubWindowSkinlet.cpp | 2 +- src/controls/QskTextInput.cpp | 6 +++--- src/controls/QskTextLabel.cpp | 2 +- src/controls/QskTextLabelSkinlet.cpp | 2 +- src/dialogs/QskDialog.h | 1 - src/dialogs/QskDialogButtonBox.cpp | 4 ++-- src/dialogs/QskDialogButtonBox.h | 2 +- src/dialogs/QskDialogWindow.cpp | 2 +- src/dialogs/QskMessageSubWindow.cpp | 2 +- src/dialogs/QskMessageSubWindow.h | 12 ++++++------ src/dialogs/QskMessageWindow.cpp | 14 +++++++------- src/dialogs/QskSelectionWindow.cpp | 4 ++-- src/inputpanel/QskInputContext.cpp | 2 +- src/inputpanel/QskInputPanel.cpp | 2 +- src/layouts/QskLinearBox.cpp | 4 ++-- src/nodes/QskBoxNode.cpp | 2 +- src/nodes/QskBoxNode.h | 2 +- src/nodes/QskBoxRendererDEllipse.cpp | 4 ++-- src/nodes/QskBoxRendererEllipse.cpp | 9 ++++++--- src/nodes/QskGraphicNode.cpp | 2 +- src/nodes/QskPaintedNode.cpp | 2 +- src/nodes/QskTextNode.cpp | 2 +- src/nodes/QskTextureNode.cpp | 2 +- src/nodes/QskVertex.cpp | 7 +++++-- 44 files changed, 87 insertions(+), 82 deletions(-) diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h index 6a07f36c..0cada7b9 100644 --- a/src/common/QskAspect.h +++ b/src/common/QskAspect.h @@ -25,8 +25,8 @@ #define QSK_NAMESPACE( name ) namespace name #define QSK_ENUM( name ) \ - inline const QMetaObject *qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \ - inline constexpr const char *qt_getEnumName(name) noexcept { return #name; } + inline const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \ + inline constexpr const char* qt_getEnumName(name) noexcept { return #name; } #endif @@ -543,7 +543,7 @@ QSK_EXPORT void qskDebugAspect( QDebug, const QMetaObject*, QskAspect::Aspect ); const QskAspect::State type::name = \ QskAspect::registerState( &type::staticMetaObject, value, #type "::" #name ); -#if !defined(_MSC_VER) +#if !defined( _MSC_VER ) #define QSK_SUBCONTROLS( ... ) static const QskAspect::Subcontrol __VA_ARGS__; #define QSK_STATES( ... ) static const QskAspect::State __VA_ARGS__; @@ -581,7 +581,7 @@ QSK_EXPORT void qskDebugAspect( QDebug, const QMetaObject*, QskAspect::Aspect ); #define _QSK_EVAL_ARG_N( _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, A, B, C, D, E, F, N, ... ) N #define _QSK_EVAL_RSEQ_N() F, E, D, C, B, A, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 -#define _QSK_CAT(x,y) x##y +#define _QSK_CAT(x,y) x ## y #define _QSK_EVAL_( N, m, ... ) _QSK_EXPAND( _QSK_CAT( _QSK_EVAL_, N )( m, __VA_ARGS__ ) ) #define _QSK_EVAL( m, ... ) _QSK_EVAL_( _QSK_EVAL_NARG( __VA_ARGS__ ), m, __VA_ARGS__ ) diff --git a/src/common/QskFlags.h b/src/common/QskFlags.h index b5ec56c6..149a0615 100644 --- a/src/common/QskFlags.h +++ b/src/common/QskFlags.h @@ -10,7 +10,7 @@ #include #define QSK_DECLARE_OPERATORS_FOR_FLAGS( Flags ) \ - constexpr inline Flags operator|( const Flags &a, const Flags &b ) noexcept \ + constexpr inline Flags operator|( const Flags& a, const Flags& b ) noexcept \ { \ using underlying = typename std::underlying_type< Flags >::type; \ return static_cast< Flags >( \ diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h index 217e92cc..a4451f77 100644 --- a/src/common/QskGlobal.h +++ b/src/common/QskGlobal.h @@ -45,10 +45,10 @@ #else -template < typename T > +template< typename T > struct QskAddConst { typedef const T Type; }; -template < typename T > +template< typename T > constexpr typename QskAddConst< T >::Type& qskAsConst( T& t ) noexcept { return t; } template< typename T > diff --git a/src/common/QskGradient.cpp b/src/common/QskGradient.cpp index a00b7e31..4c131f70 100644 --- a/src/common/QskGradient.cpp +++ b/src/common/QskGradient.cpp @@ -377,7 +377,7 @@ QskGradient QskGradient::interpolated( progress = 1.0 - value; gradient = this; } - + /* We interpolate as if the invalid gradient would be a transparent version of the valid gradient diff --git a/src/common/QskMetaFunction.cpp b/src/common/QskMetaFunction.cpp index 717d0f77..534c12ff 100644 --- a/src/common/QskMetaFunction.cpp +++ b/src/common/QskMetaFunction.cpp @@ -139,7 +139,7 @@ bool QskMetaFunction::operator==( const QskMetaFunction& other ) const if ( m_functionCall && other.m_functionCall ) { if ( m_functionCall->typeInfo() == StaticFunction && - other.m_functionCall->typeInfo() == StaticFunction ) + other.m_functionCall->typeInfo() == StaticFunction ) { // only static functions can be compared return m_functionCall->compare( diff --git a/src/controls/QskBoxSkinlet.h b/src/controls/QskBoxSkinlet.h index 95ed4371..1c55e88b 100644 --- a/src/controls/QskBoxSkinlet.h +++ b/src/controls/QskBoxSkinlet.h @@ -26,7 +26,7 @@ class QSK_EXPORT QskBoxSkinlet : public QskSkinlet QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; -protected: + protected: QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; }; diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index 3f0e2ca2..0264b2aa 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -1267,7 +1267,7 @@ void QskControl::setFixedWidth( qreal width ) auto size = d->explicitSizeHint( Qt::PreferredSize ); if ( ( d->sizePolicy.horizontalPolicy() != QskSizePolicy::Fixed ) || - ( size.width() != width ) ) + ( size.width() != width ) ) { size.setWidth( width ); @@ -1288,7 +1288,7 @@ void QskControl::setFixedHeight( qreal height ) auto size = d->explicitSizeHint( Qt::PreferredSize ); if ( ( d->sizePolicy.verticalPolicy() != QskSizePolicy::Fixed ) || - ( size.height() != height ) ) + ( size.height() != height ) ) { size.setHeight( height ); @@ -1364,7 +1364,7 @@ void QskControl::resetImplicitSize() if ( d->controlFlags & QskControl::DeferredLayout ) { /* - Is there a way to block consecutive calls ? + Is there a way to block consecutive calls ? When the parent is requesting the preferred size, we could use d->blockedImplicitSize, but in case of dynamic constraints we don't have an indication when the event has been processed. TODO ... diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 232dbd4e..aed3913f 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -22,7 +22,7 @@ class QskGeometryChangeEvent; class QskWindowChangeEvent; class QskGestureEvent; -template class QVector; +template< typename T > class QVector; class QSK_EXPORT QskControl : public QQuickItem, public QskSkinnable { diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index 41ab31e6..7c3a5fa5 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -219,8 +219,8 @@ QVector< QMetaObject::Connection > QskFocusIndicator::connectItem( const QQuickI { if ( sender->metaObject()->indexOfSignal( "focusIndicatorRectChanged()" ) >= 0 ) { - c += QObject::connect( sender, SIGNAL( focusIndicatorRectChanged() ), - this, SLOT( onFocusItemGeometryChanged() ) ); + c += QObject::connect( sender, SIGNAL(focusIndicatorRectChanged()), + this, SLOT(onFocusItemGeometryChanged()) ); } } diff --git a/src/controls/QskFocusIndicator.h b/src/controls/QskFocusIndicator.h index 56232f5e..149c5c50 100644 --- a/src/controls/QskFocusIndicator.h +++ b/src/controls/QskFocusIndicator.h @@ -8,7 +8,7 @@ #include "QskControl.h" -template class QVector; +template< typename T > class QVector; class QSK_EXPORT QskFocusIndicator : public QskControl { diff --git a/src/controls/QskPageIndicatorSkinlet.cpp b/src/controls/QskPageIndicatorSkinlet.cpp index 1953c6fd..dd99c5ab 100644 --- a/src/controls/QskPageIndicatorSkinlet.cpp +++ b/src/controls/QskPageIndicatorSkinlet.cpp @@ -66,7 +66,7 @@ QRectF QskPageIndicatorSkinlet::bulletRect( if ( indexDiff > ( indicator->count() - 1 ) ) indexDiff = ( indicator->count() - indicator->currentIndex() ); // wrapping - const qreal sz = ( indexDiff < 1 ) ? + const qreal sz = ( indexDiff < 1 ) ? ( 1 - indexDiff ) * szHighlighted + indexDiff * szNormal : szNormal; const qreal spacing = indicator->metric( QskPageIndicator::Panel | QskAspect::Spacing ); diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index 4c5e3201..64a4adec 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -267,9 +267,9 @@ QSizeF QskPushButton::contentsSizeHint() const { if ( !m_data->graphicSource.isEmpty() ) m_data->graphic = loadGraphic( m_data->graphicSource ); - + m_data->isGraphicSourceDirty = false; - } + } if ( !m_data->graphic.isEmpty() ) { diff --git a/src/controls/QskPushButton.h b/src/controls/QskPushButton.h index 248e17b7..9bd5b5fe 100644 --- a/src/controls/QskPushButton.h +++ b/src/controls/QskPushButton.h @@ -68,11 +68,11 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton QRectF layoutRect() const override; public Q_SLOTS: - void setText( const QString& text ); - void setGraphicSource( const QUrl& url ); - void setGraphicSource( const QString& source ); + void setText( const QString& ); + void setGraphicSource( const QUrl& ); + void setGraphicSource( const QString& ); void setGraphic( const QskGraphic& ); - void setGraphicSourceSize( const QSizeF & ); + void setGraphicSourceSize( const QSizeF& ); Q_SIGNALS: void cornerChanged(); diff --git a/src/controls/QskPushButtonSkinlet.cpp b/src/controls/QskPushButtonSkinlet.cpp index 12f1257a..b4501cc1 100644 --- a/src/controls/QskPushButtonSkinlet.cpp +++ b/src/controls/QskPushButtonSkinlet.cpp @@ -115,7 +115,7 @@ QRectF QskPushButtonSkinlet::graphicRect( const QskPushButton* button ) const r.setX( r.center().x() - 0.5 * maxW ); r.setWidth( maxW ); } - + if ( maxH >= 0.0 && maxH < r.height() ) { r.setY( r.center().y() - 0.5 * maxH ); diff --git a/src/controls/QskQuick.h b/src/controls/QskQuick.h index b6a4b9f0..c849c083 100644 --- a/src/controls/QskQuick.h +++ b/src/controls/QskQuick.h @@ -12,14 +12,14 @@ class QQuickItem; class QSGNode; class QRectF; -template class QList; +template< typename T > class QList; /* Exporting methods from QQuickItemPrivate, that should be part of QQuickItem. */ -QSK_EXPORT bool qskIsItemComplete( const QQuickItem* item ); +QSK_EXPORT bool qskIsItemComplete( const QQuickItem* ); QSK_EXPORT bool qskIsAncestorOf( const QQuickItem* item, const QQuickItem* child ); QSK_EXPORT bool qskIsTransparentForPositioner( const QQuickItem* ); QSK_EXPORT bool qskIsTabFence( const QQuickItem* ); diff --git a/src/controls/QskScrollView.h b/src/controls/QskScrollView.h index ba7c4211..52fec78d 100644 --- a/src/controls/QskScrollView.h +++ b/src/controls/QskScrollView.h @@ -12,7 +12,7 @@ class QSK_EXPORT QskScrollView : public QskControl { Q_OBJECT - Q_PROPERTY( QPointF scrollPos READ scrollPos + Q_PROPERTY( QPointF scrollPos READ scrollPos WRITE setScrollPos NOTIFY scrollPosChanged FINAL ) Q_PROPERTY( Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy diff --git a/src/controls/QskShortcutMap.h b/src/controls/QskShortcutMap.h index 7a094f8b..633f42c8 100644 --- a/src/controls/QskShortcutMap.h +++ b/src/controls/QskShortcutMap.h @@ -111,7 +111,7 @@ template< typename T, QskMetaFunctionTraits::IsFunctorOrStaticFunction< T >* > inline int QskShortcutMap::addShortcut( QQuickItem* item, const QKeySequence& sequence, bool autoRepeat, T function ) -{ +{ return addFunctionT( item, sequence, autoRepeat, nullptr, function ); } @@ -153,26 +153,26 @@ template< typename T, QskMetaFunctionTraits::IsMemberFunction< T >* > inline int QskShortcutMap::addShortcut( const QKeySequence& sequence, bool autoRepeat, const typename QtPrivate::FunctionPointer< T >::Object* receiver, T function ) -{ +{ return addFunctionT( nullptr, sequence, autoRepeat, receiver, function ); -} +} template< typename T, QskMetaFunctionTraits::IsMemberFunction< T >* > inline int QskShortcutMap::addShortcut( QQuickItem* item, const QKeySequence& sequence, bool autoRepeat, const typename QtPrivate::FunctionPointer< T >::Object* receiver, T function ) -{ +{ return addFunctionT( item, sequence, autoRepeat, receiver, function ); -} +} template< typename T, QskMetaFunctionTraits::IsMemberFunction< T >* > inline int QskShortcutMap::addShortcut( QQuickWindow* window, const QKeySequence& sequence, bool autoRepeat, const typename QtPrivate::FunctionPointer< T >::Object* receiver, T function ) -{ +{ auto item = window ? window->contentItem() : nullptr; return addFunctionT( item, sequence, autoRepeat, receiver, function ); -} +} template< typename T > inline int QskShortcutMap::addFunctionT( diff --git a/src/controls/QskSkin.h b/src/controls/QskSkin.h index 3a34f636..fbafef4e 100644 --- a/src/controls/QskSkin.h +++ b/src/controls/QskSkin.h @@ -130,7 +130,7 @@ class QSK_EXPORT QskSkin : public QObject protected: QskSkinHintTable& skinHintTable(); -private: + private: void declareSkinlet( const QMetaObject* controlMetaObject, const QMetaObject* skinMetaObject ); diff --git a/src/controls/QskSkinTransition.cpp b/src/controls/QskSkinTransition.cpp index be957bac..3456feef 100644 --- a/src/controls/QskSkinTransition.cpp +++ b/src/controls/QskSkinTransition.cpp @@ -169,7 +169,7 @@ namespace void start() { m_notifyConnection = - QskAnimator::addAdvanceHandler( this, SLOT( notify( QQuickWindow* ) ) ); + QskAnimator::addAdvanceHandler( this, SLOT(notify(QQuickWindow*)) ); for ( auto& it : m_hintAnimatorMap ) it.second.start(); diff --git a/src/controls/QskSubWindow.cpp b/src/controls/QskSubWindow.cpp index 3d4f0610..f255632f 100644 --- a/src/controls/QskSubWindow.cpp +++ b/src/controls/QskSubWindow.cpp @@ -154,7 +154,7 @@ void QskSubWindow::setWindowIcon( const QskGraphic& graphic ) Q_EMIT windowIconChanged(); } -} +} QskGraphic QskSubWindow::windowIcon() const { diff --git a/src/controls/QskSubWindowSkinlet.cpp b/src/controls/QskSubWindowSkinlet.cpp index f574f00f..fbaf2e7a 100644 --- a/src/controls/QskSubWindowSkinlet.cpp +++ b/src/controls/QskSubWindowSkinlet.cpp @@ -145,7 +145,7 @@ QRectF QskSubWindowSkinlet::titleRect( const QskSubWindow* subWindow ) const QskSubWindow::TitleBar | QskAspect::Spacing ); const auto symbolRect = subControlRect( subWindow, QskSubWindow::TitleBarSymbol ); - rect.setX( rect.x() + symbolRect.right() + spacing ); + rect.setX( rect.x() + symbolRect.right() + spacing ); #if 0 const QFontMetricsF fm( subWindow->effectiveFont( QskSubWindow::TitleBarText ) ); diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index 81afd9d7..0e231510 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -115,8 +115,8 @@ namespace class Validator final : public QValidator { - public: - State validate(QString &, int &) const override + public: + State validate( QString&, int& ) const override { return QValidator::Acceptable; } @@ -153,7 +153,7 @@ namespace return this->event( event ); } - protected: + protected: void geometryChanged( const QRectF& newGeometry, const QRectF& oldGeometry ) override { diff --git a/src/controls/QskTextLabel.cpp b/src/controls/QskTextLabel.cpp index c469489c..0878b7e0 100644 --- a/src/controls/QskTextLabel.cpp +++ b/src/controls/QskTextLabel.cpp @@ -136,7 +136,7 @@ void QskTextLabel::setElideMode( Qt::TextElideMode elideMode ) { auto options = m_data->textOptions; options.setElideMode( elideMode ); - + setTextOptions( options ); } diff --git a/src/controls/QskTextLabelSkinlet.cpp b/src/controls/QskTextLabelSkinlet.cpp index fd93eac1..10d1d255 100644 --- a/src/controls/QskTextLabelSkinlet.cpp +++ b/src/controls/QskTextLabelSkinlet.cpp @@ -38,7 +38,7 @@ QSGNode* QskTextLabelSkinlet::updateSubNode( { case TextRole: { - return updateTextNode( label, node, + return updateTextNode( label, node, label->text(), label->textOptions(), QskTextLabel::Text ); } } diff --git a/src/dialogs/QskDialog.h b/src/dialogs/QskDialog.h index 5cb047e0..0f99809f 100644 --- a/src/dialogs/QskDialog.h +++ b/src/dialogs/QskDialog.h @@ -99,7 +99,6 @@ class QSK_EXPORT QskDialog : public QObject Reverse = 1 << 30 }; - enum DialogCode { Rejected = 0, diff --git a/src/dialogs/QskDialogButtonBox.cpp b/src/dialogs/QskDialogButtonBox.cpp index 1afde3e3..d1bb0f0e 100644 --- a/src/dialogs/QskDialogButtonBox.cpp +++ b/src/dialogs/QskDialogButtonBox.cpp @@ -29,7 +29,7 @@ static void qskSendEventTo( QObject* object, QEvent::Type type ) static inline QskDialog::ActionRole qskActionRole( QskDialog::Action action ) { - const auto role = QPlatformDialogHelper::buttonRole( + const auto role = QPlatformDialogHelper::buttonRole( static_cast< QPlatformDialogHelper::StandardButton >( action ) ); return static_cast< QskDialog::ActionRole >( role ); @@ -260,7 +260,7 @@ void QskDialogButtonBox::addButton( /* To have a proper ownership. Inserting the buttons - according to the layout rules will be done later + according to the layout rules will be done later */ button->setParentItem( m_data->layoutBox ); diff --git a/src/dialogs/QskDialogButtonBox.h b/src/dialogs/QskDialogButtonBox.h index 498c4a9a..87101332 100644 --- a/src/dialogs/QskDialogButtonBox.h +++ b/src/dialogs/QskDialogButtonBox.h @@ -10,7 +10,7 @@ #include "QskDialog.h" class QskPushButton; -template class QVector; +template< typename T > class QVector; class QSK_EXPORT QskDialogButtonBox : public QskBox { diff --git a/src/dialogs/QskDialogWindow.cpp b/src/dialogs/QskDialogWindow.cpp index cc49f86f..4c0af95b 100644 --- a/src/dialogs/QskDialogWindow.cpp +++ b/src/dialogs/QskDialogWindow.cpp @@ -117,7 +117,7 @@ QQuickItem* QskDialogWindow::dialogContentItem() const void QskDialogWindow::setDefaultButton( QskPushButton* button ) { if ( !qskIsAncestorOf( m_data->buttonBox, button ) ) - { + { #if defined( QT_DEBUG ) qWarning( "Only buttons of the QskDialogButtonBox can be the default button." ); #endif diff --git a/src/dialogs/QskMessageSubWindow.cpp b/src/dialogs/QskMessageSubWindow.cpp index 63144e3f..d5eba883 100644 --- a/src/dialogs/QskMessageSubWindow.cpp +++ b/src/dialogs/QskMessageSubWindow.cpp @@ -74,7 +74,7 @@ class QskMessageSubWindow::PrivateData public: QskGraphicLabel* symbolLabel; QskTextLabel* textLabel; -}; +}; QskMessageSubWindow::QskMessageSubWindow( QQuickItem* parent ) : Inherited( parent ) diff --git a/src/dialogs/QskMessageSubWindow.h b/src/dialogs/QskMessageSubWindow.h index 4ac2d726..1d98232d 100644 --- a/src/dialogs/QskMessageSubWindow.h +++ b/src/dialogs/QskMessageSubWindow.h @@ -20,7 +20,7 @@ class QSK_EXPORT QskMessageSubWindow : public QskDialogSubWindow Q_PROPERTY( QskTextOptions textOptions READ textOptions WRITE setTextOptions NOTIFY textOptionsChanged ) - + Q_PROPERTY( QUrl symbolSource READ symbolSource WRITE setSymbolSource ) using Inherited = QskDialogSubWindow; @@ -31,20 +31,20 @@ class QSK_EXPORT QskMessageSubWindow : public QskDialogSubWindow void setTextOptions( const QskTextOptions& ); QskTextOptions textOptions() const; - + QString text() const; - + void setSymbolSource( const QUrl& url ); QUrl symbolSource() const; - + void setSymbolType( int symbolType ); - + void setSymbol( const QskGraphic& ); QskGraphic symbol() const; public Q_SLOTS: void setText( const QString& ); - + Q_SIGNALS: void textChanged( const QString& ); void textOptionsChanged( const QskTextOptions& ); diff --git a/src/dialogs/QskMessageWindow.cpp b/src/dialogs/QskMessageWindow.cpp index a957297f..2fbfeb9f 100644 --- a/src/dialogs/QskMessageWindow.cpp +++ b/src/dialogs/QskMessageWindow.cpp @@ -75,7 +75,7 @@ class QskMessageWindow::PrivateData public: QskGraphicLabel* symbolLabel; QskTextLabel* textLabel; -}; +}; QskMessageWindow::QskMessageWindow( QWindow* parent ) : Inherited( parent ) @@ -85,18 +85,18 @@ QskMessageWindow::QskMessageWindow( QWindow* parent ) Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint ); m_data->textLabel = new TextLabel( this ); - + m_data->symbolLabel = new SymbolLabel( this ); m_data->symbolLabel->hide(); - + const auto alignment = Qt::AlignTop | Qt::AlignHCenter; - + auto box = new QskLinearBox( Qt::Horizontal ); box->setSpacing( 0 ); - box->addItem( m_data->symbolLabel, alignment ); - box->addItem( m_data->textLabel, alignment ); + box->addItem( m_data->symbolLabel, alignment ); + box->addItem( m_data->textLabel, alignment ); box->setStretchFactor( m_data->textLabel, 10 ); - + setDialogContentItem( box ); } diff --git a/src/dialogs/QskSelectionWindow.cpp b/src/dialogs/QskSelectionWindow.cpp index 4f275649..c9f7f8ab 100644 --- a/src/dialogs/QskSelectionWindow.cpp +++ b/src/dialogs/QskSelectionWindow.cpp @@ -11,8 +11,8 @@ #include "QskTextLabel.h" #include "QskTextOptions.h" -namespace -{ +namespace +{ class TextLabel final : public QskTextLabel { public: diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index f153af64..f196f718 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -206,7 +206,7 @@ class QskInputContext::PrivateData connect( panel, &QskInputPanel::visibleChanged, context, &QskInputContext::activeChanged ); - + connect( panel, &QskInputPanel::localeChanged, context, [] { qskSendToPlatformContext( QEvent::LocaleChange ); } ); diff --git a/src/inputpanel/QskInputPanel.cpp b/src/inputpanel/QskInputPanel.cpp index 8abe2b0d..94954f70 100644 --- a/src/inputpanel/QskInputPanel.cpp +++ b/src/inputpanel/QskInputPanel.cpp @@ -321,7 +321,7 @@ void QskInputPanel::attachInputItem( QQuickItem* item ) const QInputMethodEvent::Attribute attribute( QInputMethodEvent::Cursor, 0, 0, QVariant() ); - QCoreApplication::postEvent( item, + QCoreApplication::postEvent( item, new QInputMethodEvent( QString(), { attribute } ) ); } } diff --git a/src/layouts/QskLinearBox.cpp b/src/layouts/QskLinearBox.cpp index 9ac757cf..2648e4f9 100644 --- a/src/layouts/QskLinearBox.cpp +++ b/src/layouts/QskLinearBox.cpp @@ -394,7 +394,7 @@ void QskLinearBox::rearrange() QskLayoutItem* layoutItem = engine().layoutItemAt( i ); if ( layoutItem->firstRow( Qt::Horizontal ) != col || - layoutItem->firstRow( Qt::Vertical ) != row ) + layoutItem->firstRow( Qt::Vertical ) != row ) { engine().removeItem( layoutItem ); @@ -464,7 +464,7 @@ QRectF QskLinearBox::alignedLayoutRect( const QRectF& rect ) const } if ( ( m_data->extraSpacingAt & Qt::TopEdge ) || - ( m_data->extraSpacingAt & Qt::BottomEdge ) ) + ( m_data->extraSpacingAt & Qt::BottomEdge ) ) { bool isExpandable = false; diff --git a/src/nodes/QskBoxNode.cpp b/src/nodes/QskBoxNode.cpp index eb4f54ef..dea2695d 100644 --- a/src/nodes/QskBoxNode.cpp +++ b/src/nodes/QskBoxNode.cpp @@ -54,7 +54,7 @@ void QskBoxNode::setBoxData( const QRectF& rect, const QskGradient& fillGradient QskBoxBorderColors(), fillGradient ); } -void QskBoxNode::setBoxData( const QRectF& rect, +void QskBoxNode::setBoxData( const QRectF& rect, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& borderMetrics, const QskBoxBorderColors& borderColors, const QskGradient& fillGradient ) { diff --git a/src/nodes/QskBoxNode.h b/src/nodes/QskBoxNode.h index a9b5a59f..77ae0b82 100644 --- a/src/nodes/QskBoxNode.h +++ b/src/nodes/QskBoxNode.h @@ -20,7 +20,7 @@ class QSK_EXPORT QskBoxNode : public QSGGeometryNode QskBoxNode(); ~QskBoxNode() override; - void setBoxData( const QRectF&, + void setBoxData( const QRectF&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, const QskBoxBorderColors&, const QskGradient& ); diff --git a/src/nodes/QskBoxRendererDEllipse.cpp b/src/nodes/QskBoxRendererDEllipse.cpp index 13f2cbc3..dec2ee15 100644 --- a/src/nodes/QskBoxRendererDEllipse.cpp +++ b/src/nodes/QskBoxRendererDEllipse.cpp @@ -467,7 +467,7 @@ namespace } while ( !m_iterator[ 1 ].isDone() && - ( m_iterator[ 0 ].value() > m_iterator[ 1 ].value() ) ) + ( m_iterator[ 0 ].value() > m_iterator[ 1 ].value() ) ) { m_iterator[ 1 ].advance( metrics, m_curve ); } @@ -498,7 +498,7 @@ namespace */ while ( !m_iterator[ 1 ].isDone() && - ( m_iterator[ 0 ].value() > m_iterator[ 1 ].value() ) ) + ( m_iterator[ 0 ].value() > m_iterator[ 1 ].value() ) ) { m_iterator[ 1 ].advance( m_metrics, m_curve ); } diff --git a/src/nodes/QskBoxRendererEllipse.cpp b/src/nodes/QskBoxRendererEllipse.cpp index d872934d..145bdee1 100644 --- a/src/nodes/QskBoxRendererEllipse.cpp +++ b/src/nodes/QskBoxRendererEllipse.cpp @@ -188,10 +188,13 @@ namespace } } - inline qreal dx1( int pos ) const { return m_inner[ pos] .dx; } + inline qreal dx1( int pos ) const { return m_inner[ pos].dx; } + inline qreal dy1( int pos ) const { return m_inner[ pos ].dy; } + inline qreal dx2( int pos ) const { return m_uniform ? m_outer[ 0 ].dx : m_outer[ pos ].dx; } + inline qreal dy2( int pos ) const { return m_uniform ? m_outer[ 0 ].dy : m_outer[ pos ].dy; } @@ -541,7 +544,7 @@ namespace const int stepCount = c[ 0 ].stepCount; #endif - Line *linesBR, *linesTR, *linesTL, *linesBL; + Line* linesBR, * linesTR, * linesTL, * linesBL; linesBR = linesTR = linesTL = linesBL = nullptr; const int numCornerLines = stepCount + 1; @@ -1065,7 +1068,7 @@ QskBoxRenderer::Metrics::Metrics( const QRectF& rect, c.radiusInnerX = c.radiusX - borderRight; c.radiusInnerY = c.radiusY - borderTop; - c.isCropped = ( c.centerX >= innerQuad.right ) || + c.isCropped = ( c.centerX >= innerQuad.right ) || ( c.centerY <= innerQuad.top ); break; } diff --git a/src/nodes/QskGraphicNode.cpp b/src/nodes/QskGraphicNode.cpp index b1d11342..56419623 100644 --- a/src/nodes/QskGraphicNode.cpp +++ b/src/nodes/QskGraphicNode.cpp @@ -55,7 +55,7 @@ void QskGraphicNode::setGraphic( { const auto oldRect = QskTextureNode::rect(); isTextureDirty = ( rect.width() != static_cast< int >( oldRect.width() ) ) || - ( rect.height() != static_cast< int >( oldRect.height() ) ); + ( rect.height() != static_cast< int >( oldRect.height() ) ); } QskTextureNode::setRect( rect ); diff --git a/src/nodes/QskPaintedNode.cpp b/src/nodes/QskPaintedNode.cpp index c1ea7b83..834695f1 100644 --- a/src/nodes/QskPaintedNode.cpp +++ b/src/nodes/QskPaintedNode.cpp @@ -40,7 +40,7 @@ void QskPaintedNode::update( { const auto oldRect = QskTextureNode::rect(); isTextureDirty = ( rect.width() != static_cast< int >( oldRect.width() ) ) || - ( rect.height() != static_cast< int >( oldRect.height() ) ); + ( rect.height() != static_cast< int >( oldRect.height() ) ); } QskTextureNode::setRect( rect ); diff --git a/src/nodes/QskTextNode.cpp b/src/nodes/QskTextNode.cpp index be154d2f..67fe053d 100644 --- a/src/nodes/QskTextNode.cpp +++ b/src/nodes/QskTextNode.cpp @@ -11,7 +11,7 @@ #include #include -static inline uint qskHash( +static inline uint qskHash( const QString& text, const QSizeF& size, const QFont& font, const QskTextOptions& options, const QskTextColors& colors, Qt::Alignment alignment, Qsk::TextStyle textStyle ) diff --git a/src/nodes/QskTextureNode.cpp b/src/nodes/QskTextureNode.cpp index ad305d2d..53dfe5d0 100644 --- a/src/nodes/QskTextureNode.cpp +++ b/src/nodes/QskTextureNode.cpp @@ -111,7 +111,7 @@ namespace auto* materialNew = static_cast< Material* >( newMaterial ); if ( ( materialOld == nullptr ) || - ( materialOld->textureId() != materialNew->textureId() ) ) + ( materialOld->textureId() != materialNew->textureId() ) ) { auto funcs = QOpenGLContext::currentContext()->functions(); funcs->glBindTexture( GL_TEXTURE_2D, materialNew->textureId() ); diff --git a/src/nodes/QskVertex.cpp b/src/nodes/QskVertex.cpp index 794ed7ea..ef173b6c 100644 --- a/src/nodes/QskVertex.cpp +++ b/src/nodes/QskVertex.cpp @@ -18,6 +18,7 @@ QDebug operator<<( QDebug debug, Color color ) debug << "C" << '('; debug << color.r << "," << color.g << "," << color.b << "," << color.a; debug << ')'; + return debug; } @@ -25,7 +26,8 @@ QDebug operator<<( QDebug debug, ColoredLine line ) { QDebugStateSaver saver( debug ); qDebug() << qRound( line.p1.x ) << qRound( line.p1.y ) - << "->" << qRound( line.p2.x ) << qRound( line.p2.y ); + << "->" << qRound( line.p2.x ) << qRound( line.p2.y ); + return debug; } @@ -33,7 +35,8 @@ QDebug operator<<( QDebug debug, Line line ) { QDebugStateSaver saver( debug ); qDebug() << qRound( line.p1.x ) << qRound( line.p1.y ) - << "->" << qRound( line.p2.x ) << qRound( line.p2.y ); + << "->" << qRound( line.p2.x ) << qRound( line.p2.y ); + return debug; }