From eaa3e9a9148cfc2a28bf12b41eed78c1313be5c8 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Fri, 27 Jul 2018 19:11:20 +0200 Subject: [PATCH] code cleanups --- .../mvvmcore/SampleCore/resultviewmodel.cpp | 2 +- src/imports/mvvmquick/qqmlquickpresenter.cpp | 2 +- src/mvvmcore/binding.cpp | 10 +++++----- src/mvvmcore/coreapp.cpp | 2 +- src/mvvmcore/message.cpp | 4 ++-- src/mvvmcore/message.h | 4 ++-- src/mvvmcore/settingssetuploader.cpp | 4 ++-- src/mvvmcore/viewmodel.cpp | 4 ++-- .../networkexchangeviewmodel.cpp | 2 +- src/mvvmquick/quickpresenter.cpp | 1 + src/mvvmwidgets/coloredit.cpp | 3 ++- src/mvvmwidgets/selectcombobox.cpp | 4 +++- .../tst_qmlsettingsgenerator.qmlc | Bin 5868 -> 5868 bytes 13 files changed, 23 insertions(+), 19 deletions(-) diff --git a/examples/mvvmcore/SampleCore/resultviewmodel.cpp b/examples/mvvmcore/SampleCore/resultviewmodel.cpp index b2014a8..07f4cad 100644 --- a/examples/mvvmcore/SampleCore/resultviewmodel.cpp +++ b/examples/mvvmcore/SampleCore/resultviewmodel.cpp @@ -25,7 +25,7 @@ void ResultViewModel::setResult(QString result) if (_result == result) return; - _result = result; + _result = std::move(result); emit resultChanged(_result); } diff --git a/src/imports/mvvmquick/qqmlquickpresenter.cpp b/src/imports/mvvmquick/qqmlquickpresenter.cpp index 772a017..6285d6c 100644 --- a/src/imports/mvvmquick/qqmlquickpresenter.cpp +++ b/src/imports/mvvmquick/qqmlquickpresenter.cpp @@ -127,8 +127,8 @@ void QQmlQuickPresenter::present(ViewModel *viewModel, const QVariantHash ¶m } _latestComponent = new QQmlComponent{_engine}; component = new QSharedPointer{_latestComponent.data()}; - _componentCache.insert(viewUrl, component); _loadQueue.enqueue(std::make_tuple(*component, viewModel, params, parent)); + _componentCache.insert(viewUrl, component); //setup ui status emit viewLoadingChanged(true); diff --git a/src/mvvmcore/binding.cpp b/src/mvvmcore/binding.cpp index 19cdc2c..b0ef260 100644 --- a/src/mvvmcore/binding.cpp +++ b/src/mvvmcore/binding.cpp @@ -112,14 +112,14 @@ void Binding::unbind() Binding BindingPrivate::bind(QObject *viewModel, QMetaProperty viewModelProperty, QObject *view, QMetaProperty viewProperty, Binding::BindingDirection type, QMetaMethod viewModelChangeSignal, QMetaMethod viewChangeSignal) { - QPointer binderPrivate = new BindingPrivate(viewModel, std::move(viewModelProperty), view, std::move(viewProperty)); + QPointer binderPrivate = new BindingPrivate(viewModel, viewModelProperty, view, viewProperty); if(type.testFlag(Binding::SingleInit)) binderPrivate->init(); if(type.testFlag(Binding::OneWayToView)) - binderPrivate->bindFrom(std::move(viewModelChangeSignal)); + binderPrivate->bindFrom(viewModelChangeSignal); if(type.testFlag(Binding::OneWayToViewModel)) - binderPrivate->bindTo(std::move(viewChangeSignal)); + binderPrivate->bindTo(viewChangeSignal); return binderPrivate; } @@ -128,8 +128,8 @@ BindingPrivate::BindingPrivate(QObject *viewModel, QMetaProperty viewModelProper QObject(view), viewModel(viewModel), view(view), - viewModelProperty(std::move(viewModelProperty)), - viewProperty(std::move(viewProperty)) + viewModelProperty(viewModelProperty), + viewProperty(viewProperty) { connect(viewModel, &QObject::destroyed, this, &BindingPrivate::deleteLater); diff --git a/src/mvvmcore/coreapp.cpp b/src/mvvmcore/coreapp.cpp index 234c5bf..cd23e1a 100644 --- a/src/mvvmcore/coreapp.cpp +++ b/src/mvvmcore/coreapp.cpp @@ -204,7 +204,7 @@ void CoreApp::showImp(const QMetaObject *metaObject, const QVariantHash ¶ms, QMetaObject::invokeMethod(CoreAppPrivate::dInstance().data(), "showViewModel", Qt::QueuedConnection, Q_ARG(const QMetaObject*, metaObject), Q_ARG(QVariantHash, params), - Q_ARG(QPointer, std::move(parentViewModel)), + Q_ARG(QPointer, parentViewModel), Q_ARG(quint32, 0)); } diff --git a/src/mvvmcore/message.cpp b/src/mvvmcore/message.cpp index ebee8c6..b694809 100644 --- a/src/mvvmcore/message.cpp +++ b/src/mvvmcore/message.cpp @@ -39,7 +39,7 @@ MessageConfig::MessageConfig(const QByteArray &type, const QByteArray &subType) resetButtons(); } -MessageConfig::MessageConfig(MessageConfig &&other)= default; +MessageConfig::MessageConfig(MessageConfig &&other) noexcept = default; MessageConfig::MessageConfig(const MessageConfig &other) = default; @@ -47,7 +47,7 @@ MessageConfig::~MessageConfig() = default; MessageConfig &MessageConfig::operator=(const MessageConfig &other) = default; -MessageConfig &MessageConfig::operator=(MessageConfig &&other) = default; +MessageConfig &MessageConfig::operator=(MessageConfig &&other) noexcept = default; QByteArray MessageConfig::type() const { diff --git a/src/mvvmcore/message.h b/src/mvvmcore/message.h index f70e672..51bf748 100644 --- a/src/mvvmcore/message.h +++ b/src/mvvmcore/message.h @@ -123,12 +123,12 @@ public: MessageConfig(const QByteArray &type = TypeMessageBox, const QByteArray &subType = {}); //! Copy constructor MessageConfig(const MessageConfig &other); - MessageConfig(MessageConfig &&other); + MessageConfig(MessageConfig &&other) noexcept; ~MessageConfig(); //! Assignment operator MessageConfig &operator=(const MessageConfig &other); - MessageConfig &operator=(MessageConfig &&other); + MessageConfig &operator=(MessageConfig &&other) noexcept; //! @readAcFn{MessageConfig::type} QByteArray type() const; diff --git a/src/mvvmcore/settingssetuploader.cpp b/src/mvvmcore/settingssetuploader.cpp index 36273ca..da365a7 100644 --- a/src/mvvmcore/settingssetuploader.cpp +++ b/src/mvvmcore/settingssetuploader.cpp @@ -461,10 +461,10 @@ bool SettingsSetupLoader::isUsable(const T &configElement, const QString &fronte return false; auto selects = configElement.selectors.split(QLatin1Char('|'), QString::SkipEmptyParts); - for(auto select : selects) { + for(const auto &select : selects) { auto sels = select.split(QLatin1Char('&'), QString::SkipEmptyParts); auto allSelected = true; - for(auto sel : sels) { + for(const auto &sel : sels) { if(!selectors.contains(sel)) { allSelected = false; break; diff --git a/src/mvvmcore/viewmodel.cpp b/src/mvvmcore/viewmodel.cpp index f5819de..99a3fdf 100644 --- a/src/mvvmcore/viewmodel.cpp +++ b/src/mvvmcore/viewmodel.cpp @@ -68,7 +68,7 @@ void ViewModel::showImp(const QMetaObject *metaObject, QVariantHash params, QPoi { QMetaObject::invokeMethod(CoreAppPrivate::dInstance().data(), "showViewModel", Qt::QueuedConnection, Q_ARG(const QMetaObject*, metaObject), - Q_ARG(QVariantHash, std::move(params)), - Q_ARG(QPointer, std::move(parent)), + Q_ARG(QVariantHash, params), + Q_ARG(QPointer, parent), Q_ARG(quint32, requestCode)); } diff --git a/src/mvvmdatasynccore/networkexchangeviewmodel.cpp b/src/mvvmdatasynccore/networkexchangeviewmodel.cpp index 7331e6d..ef969c2 100644 --- a/src/mvvmdatasynccore/networkexchangeviewmodel.cpp +++ b/src/mvvmdatasynccore/networkexchangeviewmodel.cpp @@ -115,7 +115,7 @@ void NetworkExchangeViewModel::setDeviceName(QString deviceName) this->deviceName() == deviceName) return; - d->exchangeManager->accountManager()->setDeviceName(std::move(deviceName)); + d->exchangeManager->accountManager()->setDeviceName(deviceName); } void NetworkExchangeViewModel::setActive(bool active) diff --git a/src/mvvmquick/quickpresenter.cpp b/src/mvvmquick/quickpresenter.cpp index cef2ee1..bb49e61 100644 --- a/src/mvvmquick/quickpresenter.cpp +++ b/src/mvvmquick/quickpresenter.cpp @@ -110,6 +110,7 @@ void QuickPresenter::setInputViewFactory(InputViewFactory *inputViewFactory) QUrl QuickPresenter::findViewUrl(const QMetaObject *viewModelType) { + Q_ASSERT(viewModelType); auto currentMeta = viewModelType; while(currentMeta && currentMeta->inherits(&ViewModel::staticMetaObject) && diff --git a/src/mvvmwidgets/coloredit.cpp b/src/mvvmwidgets/coloredit.cpp index e526752..e85ae0d 100644 --- a/src/mvvmwidgets/coloredit.cpp +++ b/src/mvvmwidgets/coloredit.cpp @@ -4,6 +4,7 @@ #include #include #include +#include using namespace QtMvvm; ColorEdit::ColorEdit(QWidget *parent) : @@ -113,7 +114,7 @@ QSize ColorButton::sizeHint() const void ColorButton::setColor(QColor color) { - _color = color; + _color = std::move(color); repaint(); } diff --git a/src/mvvmwidgets/selectcombobox.cpp b/src/mvvmwidgets/selectcombobox.cpp index 9de3a7b..32a26d2 100644 --- a/src/mvvmwidgets/selectcombobox.cpp +++ b/src/mvvmwidgets/selectcombobox.cpp @@ -21,7 +21,9 @@ QVariant SelectComboBox::currentValue() const QVariantList SelectComboBox::listElements() const { QVariantList res; - for(auto i = 0; i < count(); i++) { + auto mCount = count(); + res.reserve(mCount); + for(auto i = 0; i < mCount; i++) { auto key = itemText(i); auto value = itemData(i); if(key == value) diff --git a/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc b/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc index 3be7102bc5687a34514c944742c8310793815008..795e1c4f754e767427cfce6e8a6839cb7c761ea5 100644 GIT binary patch delta 55 zcmV-70LcIBE$l55adtFgWMOn+82|tP0Sg5Hj}DrV6FCq~;6YuI?^tXX=o;jrw*kJf NT<8V?X0t^Hrwjrw>Bo6^H-;