From b4edcddbf49f9b7792e350d54a02c7f10da2698e Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 3 Aug 2018 11:11:42 +0200 Subject: [PATCH] making clazy happy --- examples/automotive/SpeedometerSkinlet.cpp | 2 -- examples/qvgviewer/MainWindow.cpp | 2 +- src/controls/QskControl.cpp | 4 ++-- src/controls/QskFocusIndicator.cpp | 2 +- src/controls/QskShortcut.cpp | 2 +- src/controls/QskShortcut.h | 2 +- src/controls/QskSkinManager.cpp | 8 +++++--- src/controls/QskTextInput.cpp | 8 ++++---- src/controls/QskWindow.cpp | 2 +- src/inputpanel/QskInputContext.cpp | 2 +- src/inputpanel/QskInputPanel.cpp | 3 --- support/SkinnyShortcut.cpp | 2 +- 12 files changed, 18 insertions(+), 21 deletions(-) diff --git a/examples/automotive/SpeedometerSkinlet.cpp b/examples/automotive/SpeedometerSkinlet.cpp index 9cf6f0ec..5e3afb9a 100644 --- a/examples/automotive/SpeedometerSkinlet.cpp +++ b/examples/automotive/SpeedometerSkinlet.cpp @@ -247,8 +247,6 @@ QSGNode* SpeedometerSkinlet::updateNeedleNode( auto needleWidth = speedometer->metric( Speedometer::Needle | QskAspect::MinimumWidth ); auto needleMargin = speedometer->metric( Speedometer::Needle | QskAspect::Margin ); - QRectF needleRect( center.x() - needleWidth, center.y() - needleWidth, - panelRadius - ( needleWidth + needleMargin ), 2 * needleWidth ); float xStart = center.x(); float yStart = center.y(); diff --git a/examples/qvgviewer/MainWindow.cpp b/examples/qvgviewer/MainWindow.cpp index a90d87ff..c2be06f4 100644 --- a/examples/qvgviewer/MainWindow.cpp +++ b/examples/qvgviewer/MainWindow.cpp @@ -80,7 +80,7 @@ MainWindow::MainWindow() const QString resourceDir( ":/qvg" ); const QStringList icons = QDir( resourceDir ).entryList(); - for ( auto icon : icons ) + for ( const auto& icon : icons ) { auto title = icon; m_tabView->addTab( title.replace( ".qvg", "" ), diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index d0147a80..83e6b7d7 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -116,10 +116,10 @@ namespace of setting up direct connections between qskSetup and each control */ QObject::connect( qskSetup, &QskSetup::controlFlagsChanged, - [ this ] { updateControlFlags(); } ); + qskSetup, [ this ] { updateControlFlags(); } ); QObject::connect( qskSetup, &QskSetup::skinChanged, - [ this ] { updateSkin(); } ); + qskSetup, [ this ] { updateSkin(); } ); } inline void insert( QskControl* control ) diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index 4794b712..41ab31e6 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -29,7 +29,7 @@ class QskFocusIndicator::PrivateData public: void resetConnections() { - for ( const auto& connection : connections ) + for ( const auto& connection : qskAsConst( connections ) ) QObject::disconnect( connection ); connections.clear(); diff --git a/src/controls/QskShortcut.cpp b/src/controls/QskShortcut.cpp index 2ec12363..c6330698 100644 --- a/src/controls/QskShortcut.cpp +++ b/src/controls/QskShortcut.cpp @@ -78,7 +78,7 @@ class QskShortcut::PrivateData } if ( oldId != id ) - shortcut->Q_EMIT shortcutIdChanged( id ); + Q_EMIT shortcut->shortcutIdChanged( id ); } public: diff --git a/src/controls/QskShortcut.h b/src/controls/QskShortcut.h index 3f7b8061..886daec4 100644 --- a/src/controls/QskShortcut.h +++ b/src/controls/QskShortcut.h @@ -79,7 +79,7 @@ class QSK_EXPORT QskShortcut : public QObject, public QQmlParserStatus void activated(); void activatedAmbiguously(); - int shortcutIdChanged( int ) const; + int shortcutIdChanged( int ); protected: bool event( QEvent* ) override; diff --git a/src/controls/QskSkinManager.cpp b/src/controls/QskSkinManager.cpp index 29d38b0b..caf26ca2 100644 --- a/src/controls/QskSkinManager.cpp +++ b/src/controls/QskSkinManager.cpp @@ -331,7 +331,7 @@ class QskSkinManager::PrivateData { if ( !pluginsRegistered ) { - for ( auto path : pluginPaths ) + for ( const auto& path : qskAsConst( pluginPaths ) ) registerPlugins( path + QStringLiteral( "/skins" ) ); pluginsRegistered = true; @@ -350,7 +350,9 @@ class QskSkinManager::PrivateData FactoryLoader* loader = nullptr; - for ( auto fileName : dir.entryList( QDir::Files ) ) + const auto dirEntries = dir.entryList( QDir::Files ); + + for ( const auto& fileName : dirEntries ) { if ( loader == nullptr ) loader = new FactoryLoader(); @@ -423,7 +425,7 @@ void QskSkinManager::setPluginPaths( const QStringList& paths ) QSet< QString > pathSet; // checking for duplicates QStringList pluginPaths; - for ( auto path : paths ) + for ( const auto& path : paths ) { const auto pluginPath = qskResolvedPath( path ); if ( !pluginPath.isEmpty() && !pathSet.contains( pluginPath ) ) diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index 15b97828..978e150d 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -33,11 +33,11 @@ static inline void qskBindSignals( const QQuickTextInput* wrappedInput, QskTextInput* input ) { QObject::connect( wrappedInput, &QQuickTextInput::textChanged, - input, [ input ] { input->Q_EMIT textChanged( input->text() ); } ); + input, [ input ] { Q_EMIT input->textChanged( input->text() ); } ); #if QT_VERSION >= QT_VERSION_CHECK( 5, 9, 0 ) QObject::connect( wrappedInput, &QQuickTextInput::textEdited, - input, [ input ] { input->Q_EMIT textEdited( input->text() ); } ); + input, [ input ] { Q_EMIT input->textEdited( input->text() ); } ); #endif QObject::connect( wrappedInput, &QQuickTextInput::validatorChanged, @@ -58,7 +58,7 @@ static inline void qskBindSignals( input, &QskTextInput::maximumLengthChanged ); QObject::connect( wrappedInput, &QQuickTextInput::echoModeChanged, - input, [ input ] { input->Q_EMIT echoModeChanged( input->echoMode() ); } ); + input, [ input ] { Q_EMIT input->echoModeChanged( input->echoMode() ); } ); QObject::connect( wrappedInput, &QQuickTextInput::passwordCharacterChanged, input, &QskTextInput::passwordCharacterChanged ); @@ -569,7 +569,7 @@ void QskTextInput::setEditing( bool on ) if ( status == QQuickTextInputPrivate::AcceptableInput ) { if ( fixup() ) - m_data->textInput->Q_EMIT editingFinished(); + Q_EMIT m_data->textInput->editingFinished(); } #if 0 diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index 16144621..5572fcd2 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -154,7 +154,7 @@ QskWindow::~QskWindow() items += child; } - for ( auto item : qskAsConst( items ) ) + for ( auto& item : qskAsConst( items ) ) delete item; } diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index 91573f0b..12a94327 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -151,7 +151,7 @@ namespace }; } -static QPointer< QskInputContext > qskInputContext = nullptr; +static QPointer< QskInputContext > qskInputContext; static void qskSendToPlatformContext( QEvent::Type type ) { diff --git a/src/inputpanel/QskInputPanel.cpp b/src/inputpanel/QskInputPanel.cpp index bedff8f3..8abe2b0d 100644 --- a/src/inputpanel/QskInputPanel.cpp +++ b/src/inputpanel/QskInputPanel.cpp @@ -298,9 +298,6 @@ void QskInputPanel::attachInputItem( QQuickItem* item ) if ( item ) { - auto context = QskInputContext::instance(); - const auto locale = context->locale(); - if ( m_data->predictor ) m_data->predictor->reset(); diff --git a/support/SkinnyShortcut.cpp b/support/SkinnyShortcut.cpp index 029d6779..0244e514 100644 --- a/support/SkinnyShortcut.cpp +++ b/support/SkinnyShortcut.cpp @@ -174,7 +174,7 @@ void SkinnyShortcut::changeFonts( int increment ) skin->setFont( role, font ); } - qskSetup->Q_EMIT skinChanged( skin ); + Q_EMIT qskSetup->skinChanged( skin ); } static inline void countNodes( const QSGNode* node, int& counter )