summaryrefslogtreecommitdiffstats
path: root/wayland/democompositor/apps/applistmodel.h
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2017-08-13 09:41:50 +0200
committerHolger Freyther <holger+qt@freyther.de>2017-09-12 06:16:50 +0000
commitb18b35e2d2db771c754eee9fec7faada2b8fd303 (patch)
treebebbfb9406d24c71654ee87bd7c978bd98bf38ee /wayland/democompositor/apps/applistmodel.h
parente1c257c3330057d7df70d3a1e92361afcdd06579 (diff)
democompositor: Give up on having AppEntry with only const members
When building gadgets that include instances of AppEntry that will expose these member variables a Q_PROPERTY we will end trying to do a std::move (even if the AppEntry is not movable). Remove the const from the member variables, leave the CONSTANT in the property to not generate a write function and let's keep the discipline to not assign to an existing AppEntry. Change-Id: I742a9d091e7e6eac6cc3cb84a48b7b8812a24247 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'wayland/democompositor/apps/applistmodel.h')
-rw-r--r--wayland/democompositor/apps/applistmodel.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/wayland/democompositor/apps/applistmodel.h b/wayland/democompositor/apps/applistmodel.h
index b177ece..9147f54 100644
--- a/wayland/democompositor/apps/applistmodel.h
+++ b/wayland/democompositor/apps/applistmodel.h
@@ -50,11 +50,11 @@
#pragma once
+#include "appentry.h"
+
#include <QtCore/QAbstractListModel>
#include <QtCore/QVector>
-class AppEntry;
-
/**
* A model that holds all available applications and
* exports them to a QML scene
@@ -63,8 +63,6 @@ class AppListModel : public QAbstractListModel {
Q_OBJECT
public:
- ~AppListModel();
-
enum Roles {
App = Qt::UserRole,
IconName,
@@ -87,6 +85,6 @@ public Q_SLOTS:
private:
void doAddFile(const QString& fileName);
- QVector<AppEntry*> m_rows;
+ QVector<AppEntry> m_rows;
static QHash<int, QByteArray> m_roles;
};