From c3b6830eb52822744560861cf91680c82955635a Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 30 Oct 2017 08:33:43 +0100 Subject: [PATCH] making clazy happier --- examples/automotive/DefaultSkin.cpp | 4 ++-- examples/automotive/DefaultSkin.h | 2 +- inputcontext/QskInputCompositionModel.cpp | 2 +- src/common/QskAspect.cpp | 6 +++--- src/controls/QskControl.cpp | 2 +- src/controls/QskListView.cpp | 2 +- src/controls/QskSeparator.h | 2 +- src/controls/QskShortcut.cpp | 2 +- src/controls/QskSkinFactory.cpp | 4 ++-- src/controls/QskSkinTransition.cpp | 4 ++-- src/dialogs/QskInputSubWindow.cpp | 2 +- src/graphic/QskGraphic.cpp | 4 ++-- src/graphic/QskStandardSymbol.cpp | 1 - src/nodes/QskPlainTextRenderer.cpp | 2 +- support/SkinnyFont.cpp | 2 +- support/SkinnyShapeProvider.cpp | 1 - 16 files changed, 20 insertions(+), 22 deletions(-) diff --git a/examples/automotive/DefaultSkin.cpp b/examples/automotive/DefaultSkin.cpp index 486e7f74..d254b63a 100644 --- a/examples/automotive/DefaultSkin.cpp +++ b/examples/automotive/DefaultSkin.cpp @@ -24,7 +24,7 @@ protected: virtual void updateSkin( QskSkin*, QskSkin* newSkin ) override final { DefaultSkin* skin = static_cast< DefaultSkin* >( newSkin ); - skin->resetColors(); + skin->resetHints(); } }; @@ -182,7 +182,7 @@ void DefaultSkin::toggleScheme() transition.process(); } -void DefaultSkin::resetColors() +void DefaultSkin::resetHints() { delete m_palette; m_palette = new Palette( m_scheme ); diff --git a/examples/automotive/DefaultSkin.h b/examples/automotive/DefaultSkin.h index 22e4b601..7fbc2996 100644 --- a/examples/automotive/DefaultSkin.h +++ b/examples/automotive/DefaultSkin.h @@ -12,7 +12,7 @@ public: virtual ~DefaultSkin(); void toggleScheme(); - void resetColors(); + void resetHints(); enum Scheme { diff --git a/inputcontext/QskInputCompositionModel.cpp b/inputcontext/QskInputCompositionModel.cpp index 56986703..a4528f1e 100644 --- a/inputcontext/QskInputCompositionModel.cpp +++ b/inputcontext/QskInputCompositionModel.cpp @@ -152,7 +152,7 @@ void QskInputCompositionModel::composeKey( Qt::Key key ) if ( firstCandidate.isEmpty() ) { commit( oldPreedit.left( spaceLeft ) ); - spaceLeft -= oldPreedit.left( spaceLeft ).length(); + spaceLeft -= oldPreedit.leftRef( spaceLeft ).length(); } else { diff --git a/src/common/QskAspect.cpp b/src/common/QskAspect.cpp index 2667290d..6657e092 100644 --- a/src/common/QskAspect.cpp +++ b/src/common/QskAspect.cpp @@ -129,11 +129,11 @@ static QByteArray qskEnumString( const char* name, int value ) QByteArray qskStateKey( const QMetaObject* metaObject, quint16 state ) { - auto& stateTable = qskAspectRegistry->stateTable; + const auto& stateTable = qskAspectRegistry->stateTable; for ( auto mo = metaObject; mo != nullptr; mo = mo->superClass() ) { - auto it = stateTable.find( mo ); + const auto it = stateTable.find( mo ); if ( it != stateTable.end() ) { for ( const auto& info : it->second ) @@ -144,7 +144,7 @@ QByteArray qskStateKey( const QMetaObject* metaObject, quint16 state ) } } - return QByteArray();; + return QByteArray(); } static QByteArray qskStateString( diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index a2dce763..91637adf 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -417,7 +417,7 @@ void QskControl::setFocusPolicy( Qt::FocusPolicy policy ) d->focusPolicy = policy & ~Qt::TabFocus; QQuickItem::setActiveFocusOnTab( policy & Qt::TabFocus ); - Q_EMIT ( focusPolicyChanged() ); + Q_EMIT focusPolicyChanged(); } } diff --git a/src/controls/QskListView.cpp b/src/controls/QskListView.cpp index 1b30430d..3739959c 100644 --- a/src/controls/QskListView.cpp +++ b/src/controls/QskListView.cpp @@ -48,7 +48,7 @@ void QskListView::setPreferredWidthFromColumns( bool on ) m_data->preferredWidthFromColumns = on; resetImplicitSize(); - Q_EMIT preferredWidthFromColumns(); + Q_EMIT preferredWidthFromColumnsChanged(); } } diff --git a/src/controls/QskSeparator.h b/src/controls/QskSeparator.h index a3104ffe..e5cb042c 100644 --- a/src/controls/QskSeparator.h +++ b/src/controls/QskSeparator.h @@ -40,7 +40,7 @@ public: Q_SIGNALS: void orientationChanged( Qt::Orientation ); - void thicknessChanged() const; + void thicknessChanged(); private: Qt::Orientation m_orientation; diff --git a/src/controls/QskShortcut.cpp b/src/controls/QskShortcut.cpp index d15e68c5..4f9c88d1 100644 --- a/src/controls/QskShortcut.cpp +++ b/src/controls/QskShortcut.cpp @@ -135,7 +135,7 @@ int QskShortcut::addShortcut( QQuickWindow* window, const QKeySequence& key, const QMetaObject* metaObject = receiver->metaObject(); const int methodIndex = metaObject->indexOfMethod( - QMetaObject::normalizedSignature( method ).data() + 1 ); + QMetaObject::normalizedSignature( method ).constData() + 1 ); if ( methodIndex >= 0 ) { diff --git a/src/controls/QskSkinFactory.cpp b/src/controls/QskSkinFactory.cpp index e8ec26d2..a772388e 100644 --- a/src/controls/QskSkinFactory.cpp +++ b/src/controls/QskSkinFactory.cpp @@ -81,7 +81,7 @@ QStringList Qsk::skinNames() { QStringList names; - for ( auto factory : qskGetFactoryTable() ) + for ( const auto& factory : qskGetFactoryTable() ) { if ( factory ) names += factory->skinNames(); @@ -94,7 +94,7 @@ QskSkin* Qsk::createSkin( const QString& skinName ) { if ( !skinName.isEmpty() ) { - for ( auto factory : qskGetFactoryTable() ) + for ( const auto& factory : qskGetFactoryTable() ) { QskSkin* skin = factory->createSkin( skinName ); if ( skin ) diff --git a/src/controls/QskSkinTransition.cpp b/src/controls/QskSkinTransition.cpp index 5016be76..7565689e 100644 --- a/src/controls/QskSkinTransition.cpp +++ b/src/controls/QskSkinTransition.cpp @@ -70,7 +70,7 @@ static QVector< AnimatorCandidate > qskAnimatorCandidates( if ( !oldTable.hasHints() ) return candidates; - for ( auto entry : newTable.hints() ) + for ( const auto& entry : newTable.hints() ) { const auto aspect = entry.first; @@ -241,7 +241,7 @@ namespace { const auto subControls = control->subControls(); - for ( auto candidate : candidates ) + for ( const auto& candidate : candidates ) { using namespace QskAspect; diff --git a/src/dialogs/QskInputSubWindow.cpp b/src/dialogs/QskInputSubWindow.cpp index d249c841..6385e533 100644 --- a/src/dialogs/QskInputSubWindow.cpp +++ b/src/dialogs/QskInputSubWindow.cpp @@ -29,7 +29,7 @@ namespace setTextOptions( options ); - connect( this, SIGNAL( textChanged( QString ) ), + connect( this, SIGNAL( textChanged(QString) ), box, SIGNAL( infoTextChanged() ) ); connect( this, SIGNAL( textOptionsChanged() ), diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp index e6d40af7..c43254f1 100644 --- a/src/graphic/QskGraphic.cpp +++ b/src/graphic/QskGraphic.cpp @@ -910,7 +910,7 @@ void QskGraphic::updateState( const QPaintEngineState& state ) } else if ( auto gradient = pen.brush().gradient() ) { - for ( auto stop : gradient->stops() ) + for ( const auto& stop : gradient->stops() ) qskInsertColor( stop.second, m_data->colorTable ); } } @@ -925,7 +925,7 @@ void QskGraphic::updateState( const QPaintEngineState& state ) } else if ( auto gradient = brush.gradient() ) { - for ( auto stop : gradient->stops() ) + for ( const auto& stop : gradient->stops() ) qskInsertColor( stop.second, m_data->colorTable ); } } diff --git a/src/graphic/QskStandardSymbol.cpp b/src/graphic/QskStandardSymbol.cpp index f794d71d..612b4a45 100644 --- a/src/graphic/QskStandardSymbol.cpp +++ b/src/graphic/QskStandardSymbol.cpp @@ -32,7 +32,6 @@ static void qskOkGraphic( QPainter* painter ) painter->setPen( Qt::NoPen ); - painter->setBrush( QColor( "#4caf50" ) ); painter->setBrush( QColor( 76, 175, 80 ) ); painter->drawPath( path ); } diff --git a/src/nodes/QskPlainTextRenderer.cpp b/src/nodes/QskPlainTextRenderer.cpp index 90c6010e..431e7ea7 100644 --- a/src/nodes/QskPlainTextRenderer.cpp +++ b/src/nodes/QskPlainTextRenderer.cpp @@ -116,7 +116,7 @@ static void qskRenderText( for ( int i = 0; i < layout->lineCount(); ++i ) { auto line = layout->lineAt( i ); - for ( auto glyphRun : line.glyphRuns() ) + for ( const auto& glyphRun : line.glyphRuns() ) { const bool doCreate = !glyphNode; if ( doCreate ) diff --git a/support/SkinnyFont.cpp b/support/SkinnyFont.cpp index bd462284..4018e768 100644 --- a/support/SkinnyFont.cpp +++ b/support/SkinnyFont.cpp @@ -24,7 +24,7 @@ static void foolFontconfig() "\t%1\n" "\t%2/cache\n" "\n"; - fontConfig = fontConfig.arg( dir.path() ).arg( dir.path() ); + fontConfig = fontConfig.arg( dir.path(), dir.path() ); QFile f( dir.path() + "/fonts.conf" ); f.open( QIODevice::WriteOnly ); diff --git a/support/SkinnyShapeProvider.cpp b/support/SkinnyShapeProvider.cpp index 503f8e8d..0bbad1b2 100644 --- a/support/SkinnyShapeProvider.cpp +++ b/support/SkinnyShapeProvider.cpp @@ -23,7 +23,6 @@ const QskGraphic* SkinnyShapeProvider::loadGraphic( const QString& id ) const const QSizeF sz( 40, 40 ); QPainterPath path; - QColor color; if ( shapeName == "rectangle" ) {