From a3667cb3bae53f7d3830b2110e373803a4649d7c Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 5 Mar 2015 15:39:51 +0100
Subject: [PATCH] setOrcer->moveItem

---
 containments/homescreen/contents/ui/HomeLauncher.qml | 2 +-
 qmlcomponents/applicationlistmodel.cpp               | 6 +-----
 qmlcomponents/applicationlistmodel.h                 | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/containments/homescreen/contents/ui/HomeLauncher.qml b/containments/homescreen/contents/ui/HomeLauncher.qml
index 7889c037..a8a0e68f 100644
--- a/containments/homescreen/contents/ui/HomeLauncher.qml
+++ b/containments/homescreen/contents/ui/HomeLauncher.qml
@@ -70,7 +70,7 @@ Item {
             if (delegateItem.drag.target) {
                 var pos = mapToItem(delegateRoot.parent, 0, 0);
 
-                appListModel.setOrder(model.ApplicationOriginalRowRole, (Math.round(delegateRoot.GridView.view.width / delegateRoot.GridView.view.cellWidth) * Math.round(pos.y / delegateRoot.GridView.view.cellHeight) + Math.round(pos.x / delegateRoot.GridView.view.cellWidth)));
+                appListModel.moveItem(model.ApplicationOriginalRowRole, (Math.round(delegateRoot.GridView.view.width / delegateRoot.GridView.view.cellWidth) * Math.round(pos.y / delegateRoot.GridView.view.cellHeight) + Math.round(pos.x / delegateRoot.GridView.view.cellWidth)));
             }
         }
 
diff --git a/qmlcomponents/applicationlistmodel.cpp b/qmlcomponents/applicationlistmodel.cpp
index 0d63b9e4..b6362601 100644
--- a/qmlcomponents/applicationlistmodel.cpp
+++ b/qmlcomponents/applicationlistmodel.cpp
@@ -50,7 +50,6 @@ QHash<int, QByteArray> ApplicationListModel::roleNames() const
     roleNames[ApplicationIconRole] = "ApplicationIconRole";
     roleNames[ApplicationStorageIdRole] = "ApplicationStorageIdRole";
     roleNames[ApplicationEntryPathRole] = "ApplicationEntryPathRole";
-    roleNames[ApplicationOrderRole] = "ApplicationOrderRole";
     roleNames[ApplicationOriginalRowRole] = "ApplicationOriginalRowRole";
 
     return roleNames;
@@ -89,7 +88,6 @@ void ApplicationListModel::loadApplications()
                             data.icon = plugin.icon();
                             data.storageId = service->storageId();
                             data.entryPath = plugin.entryPath();
-                            data.order = 99;
                             m_applicationList << data;
                         }
                     }
@@ -118,8 +116,6 @@ QVariant ApplicationListModel::data(const QModelIndex &index, int role) const
         return m_applicationList.at(index.row()).storageId;
     case ApplicationEntryPathRole:
         return m_applicationList.at(index.row()).entryPath;
-    case ApplicationOrderRole:
-        return m_applicationList.at(index.row()).order;
     case ApplicationOriginalRowRole:
         return index.row();
 
@@ -137,7 +133,7 @@ int ApplicationListModel::rowCount(const QModelIndex &parent) const
     return m_applicationList.count();
 }
 
-Q_INVOKABLE void ApplicationListModel::setOrder(int row, int destination)
+Q_INVOKABLE void ApplicationListModel::moveItem(int row, int destination)
 {
     if (row < 0 || destination < 0 || row >= m_applicationList.length() ||
         destination >= m_applicationList.length() || row == destination) {
diff --git a/qmlcomponents/applicationlistmodel.h b/qmlcomponents/applicationlistmodel.h
index c3a4f5dd..8e4f82ee 100644
--- a/qmlcomponents/applicationlistmodel.h
+++ b/qmlcomponents/applicationlistmodel.h
@@ -32,7 +32,6 @@ struct ApplicationData {
     QString icon;
     QString storageId;
     QString entryPath;
-    int order;
 };
 
 class ApplicationListModel : public QAbstractListModel {
@@ -57,11 +56,10 @@ public:
         ApplicationIconRole = Qt::UserRole + 2,
         ApplicationStorageIdRole = Qt::UserRole + 3,
         ApplicationEntryPathRole = Qt::UserRole + 4,
-        ApplicationOrderRole = Qt::UserRole + 5,
         ApplicationOriginalRowRole  = Qt::UserRole + 6
     };
 
-    Q_INVOKABLE void setOrder(int row, int order);
+    Q_INVOKABLE void moveItem(int row, int order);
 
     Q_INVOKABLE void runApplication(const QString &storageId);