diff --git a/containments/homescreen/applicationlistmodel.cpp b/containments/homescreen/applicationlistmodel.cpp index 6316558c..433e2d3b 100644 --- a/containments/homescreen/applicationlistmodel.cpp +++ b/containments/homescreen/applicationlistmodel.cpp @@ -94,7 +94,7 @@ void ApplicationListModel::sycocaDbChanged(const QStringList &changes) loadApplications(); } -bool appNameLessThan(const ApplicationData &a1, const ApplicationData &a2) +bool appNameLessThan(const ApplicationListModel::ApplicationData &a1, const ApplicationListModel::ApplicationData &a2) { return a1.name.toLower() < a2.name.toLower(); } diff --git a/containments/homescreen/applicationlistmodel.h b/containments/homescreen/applicationlistmodel.h index f33d3fd3..c45220c1 100644 --- a/containments/homescreen/applicationlistmodel.h +++ b/containments/homescreen/applicationlistmodel.h @@ -32,15 +32,6 @@ class QString; class ApplicationListModel; -struct ApplicationData { - QString name; - QString icon; - QString storageId; - QString entryPath; - int location = 0; //FIXME - bool startupNotify = true; -}; - class ApplicationListModel : public QAbstractListModel { Q_OBJECT @@ -56,6 +47,15 @@ public: }; Q_ENUM(LauncherLocation) + struct ApplicationData { + QString name; + QString icon; + QString storageId; + QString entryPath; + LauncherLocation location = LauncherLocation::Grid; + bool startupNotify = true; + }; + enum Roles { ApplicationNameRole = Qt::UserRole + 1, ApplicationIconRole,