Try to keep the module unchanged until the function begin[Insert|Remove]Rows is called. Fixes: https://bugs.launchpad.net/bugs/1090305.

Approved by Gustavo Pichorim Boiko, Lars Uebernickel, PS Jenkins bot.

1 files changed, 11 insertions, 3 deletions

diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h
index f186b5f..d83a35c 100644
--- a/libqmenumodel/src/qmenumodel.h
+++ b/libqmenumodel/src/qmenumodel.h
@@ -54,6 +54,7 @@ public:
 
 Q_SIGNALS:
     void countChanged();
+    void aboutToRemoveLink(QMenuModel *link, int row);
 
 protected:
     QMenuModel(GMenuModel *other=0, QObject *parent=0);
@@ -67,13 +68,20 @@ private:
     QHash<int, QMenuModel*>* m_cache;
     GMenuModel *m_menuModel;
     guint m_signalChangedId;
+    guint m_rowCount;
 
-    QVariant getStringAttribute(const QModelIndex &index, const QString &attribute) const;
-    QVariant getLink(const QModelIndex &index, const QString &linkName) const;
-    QVariant getExtraProperties(const QModelIndex &index) const;
+    //control variables
+    int m_currentOperationPosition;
+    int m_currentOperationAdded;
+    int m_currentOperationRemoved;
+
+    QVariant getStringAttribute(int row, const QString &attribute) const;
+    QVariant getLink(int row, const QString &linkName) const;
+    QVariant getExtraProperties(int row) const;
     QString parseExtraPropertyName(const QString &name) const;
     void clearModel(bool destructor=false);
     int count() const;
+    int rowIndex(const QModelIndex &index) const;
 
     static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data);
 };