From a0fe997bbe54b98a6338aa28d8b008266e423081 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sun, 3 Mar 2013 12:05:21 +0100
Subject: Port to Qt5

* Change #include to qt5
* Fix missing QX11Info
* use explicit constructor for QVariant(QColor)
* use beginResetModel() and endResetModel() instead of reset(). The
latter was removed. Hopefully it still works :)
---
 seriestreemodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'seriestreemodel.cpp')

diff --git a/seriestreemodel.cpp b/seriestreemodel.cpp
index c8260c4..4ec9f3f 100644
--- a/seriestreemodel.cpp
+++ b/seriestreemodel.cpp
@@ -577,6 +577,7 @@ bool SeriesTreeModel::mergeSeries(const QModelIndex &from, const QModelIndex &to
 	mUpdateSeriesIdQuery->bindValue(":oldid", oldSeriesId);
 	mUpdateSeriesIdQuery->bindValue(":newid", newSeriesId);
 	if(mUpdateSeriesIdQuery->exec()){
+        beginResetModel();
 		SmTreeItem *oldParent = static_cast<SmTreeItem*>(from.internalPointer());
 		SmTreeItem *newParent = static_cast<SmTreeItem*>(to.internalPointer());
 		//reparent items to new series
@@ -598,8 +599,7 @@ bool SeriesTreeModel::mergeSeries(const QModelIndex &from, const QModelIndex &to
 			mSeriesPartSeriesMap.remove(seriesPartId);
 			mSeriesPartSeriesMap.insert(seriesPartId, newSeriesId);
 		}
-
-		reset();
+        endResetModel();
 		return true;
 	}
 	return false;
-- 
cgit v1.2.3-70-g09d2