Browse Source

code cleanups

pull/2/head
Skycoder42 7 years ago
parent
commit
eaa3e9a914
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 2
      examples/mvvmcore/SampleCore/resultviewmodel.cpp
  2. 2
      src/imports/mvvmquick/qqmlquickpresenter.cpp
  3. 10
      src/mvvmcore/binding.cpp
  4. 2
      src/mvvmcore/coreapp.cpp
  5. 4
      src/mvvmcore/message.cpp
  6. 4
      src/mvvmcore/message.h
  7. 4
      src/mvvmcore/settingssetuploader.cpp
  8. 4
      src/mvvmcore/viewmodel.cpp
  9. 2
      src/mvvmdatasynccore/networkexchangeviewmodel.cpp
  10. 1
      src/mvvmquick/quickpresenter.cpp
  11. 3
      src/mvvmwidgets/coloredit.cpp
  12. 4
      src/mvvmwidgets/selectcombobox.cpp
  13. BIN
      tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc

2
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);
}

2
src/imports/mvvmquick/qqmlquickpresenter.cpp

@ -127,8 +127,8 @@ void QQmlQuickPresenter::present(ViewModel *viewModel, const QVariantHash &param
}
_latestComponent = new QQmlComponent{_engine};
component = new QSharedPointer<QQmlComponent>{_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);

10
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<BindingPrivate> binderPrivate = new BindingPrivate(viewModel, std::move(viewModelProperty), view, std::move(viewProperty));
QPointer<BindingPrivate> 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);

2
src/mvvmcore/coreapp.cpp

@ -204,7 +204,7 @@ void CoreApp::showImp(const QMetaObject *metaObject, const QVariantHash &params,
QMetaObject::invokeMethod(CoreAppPrivate::dInstance().data(), "showViewModel", Qt::QueuedConnection,
Q_ARG(const QMetaObject*, metaObject),
Q_ARG(QVariantHash, params),
Q_ARG(QPointer<ViewModel>, std::move(parentViewModel)),
Q_ARG(QPointer<ViewModel>, parentViewModel),
Q_ARG(quint32, 0));
}

4
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
{

4
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;

4
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;

4
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<ViewModel>, std::move(parent)),
Q_ARG(QVariantHash, params),
Q_ARG(QPointer<ViewModel>, parent),
Q_ARG(quint32, requestCode));
}

2
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)

1
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) &&

3
src/mvvmwidgets/coloredit.cpp

@ -4,6 +4,7 @@
#include <QtWidgets/QStylePainter>
#include <QtWidgets/QStyleOptionFrame>
#include <QtMvvmCore/Messages>
#include <utility>
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();
}

4
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)

BIN
tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc

Binary file not shown.
Loading…
Cancel
Save