diff options
| author | Bret Curtis <psi29a@gmail.com> | 2020-11-01 23:24:24 +0100 |
|---|---|---|
| committer | Bret Curtis <psi29a@gmail.com> | 2020-11-01 23:52:27 +0100 |
| commit | f0e2b7c06ba097e7b5ee1b93e53c0b21bfaf7759 (patch) | |
| tree | 60b024542ff17e67e4ef15906c33feb67a4422f0 | |
| parent | af12390fa89f18a518783736f9d7e58bc8c073aa (diff) | |
Move it from the buildContentModel stack frame to the ContentModel instance. The ContentModel constructor would need to take an rvalue reference (QIcon&&).cleanup_2
| -rw-r--r-- | components/contentselector/model/contentmodel.cpp | 4 | ||||
| -rw-r--r-- | components/contentselector/model/contentmodel.hpp | 2 | ||||
| -rw-r--r-- | components/contentselector/view/contentselector.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp index d669ebbd03..6fb8a74c84 100644 --- a/components/contentselector/model/contentmodel.cpp +++ b/components/contentselector/model/contentmodel.cpp @@ -10,9 +10,9 @@ #include <components/esm/esmreader.hpp> #include <utility> -ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon) : +ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon&& warningIcon) : QAbstractTableModel(parent), - mWarningIcon(std::move(warningIcon)), + mWarningIcon(warningIcon), mMimeType ("application/omwcontent"), mMimeTypes (QStringList() << mMimeType), mColumnCount (1), diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp index 86104cdc12..cc311a01ef 100644 --- a/components/contentselector/model/contentmodel.hpp +++ b/components/contentselector/model/contentmodel.hpp @@ -23,7 +23,7 @@ namespace ContentSelectorModel { Q_OBJECT public: - explicit ContentModel(QObject *parent, QIcon warningIcon); + explicit ContentModel(QObject *parent, QIcon&& warningIcon); ~ContentModel() override; void setEncoding(const QString &encoding); diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp index 6bb8e6e2c7..fb285823c9 100644 --- a/components/contentselector/view/contentselector.cpp +++ b/components/contentselector/view/contentselector.cpp @@ -24,7 +24,7 @@ ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) : void ContentSelectorView::ContentSelector::buildContentModel() { QIcon warningIcon(ui.addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 15))); - mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon); + mContentModel = new ContentSelectorModel::ContentModel(this, std::move(warningIcon)); } void ContentSelectorView::ContentSelector::buildGameFileView() |