From 0d2e2cdfccd9571ce6c3729ba8b59cde44cf8b5d Mon Sep 17 00:00:00 2001
From: Maks Orlovich <maksim@kde.org>
Date: Sun, 23 Sep 2007 15:23:10 +0000
Subject: [PATCH] Fix this up so I can drag things around properly, and have
 them get to their destination without getting misplaced or a crash.

In short, keeping iterators to a changing QList is a Bad Idea(tm),
so I did the simple thing can used indices.

svn path=/trunk/KDE/kdebase/workspace/; revision=715952
---
 kcmkwin/kwindecoration/buttons.cpp | 58 +++++++++++++++---------------
 kcmkwin/kwindecoration/buttons.h   |  4 +--
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index f83c0be7da..f997271f57 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -382,21 +382,21 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
 
 	// collect information where to insert the dropped button
 	ButtonList *buttonList = 0;
-	ButtonList::iterator buttonPosition;
+	int         buttonPosition;
 
 	if (leftDropArea().contains(p) ) {
 		buttonList = &buttonsLeft;
-		buttonPosition = buttonsLeft.end();
+		buttonPosition = buttonsLeft.size();
 	} else if (rightDropArea().contains(p) ) {
 		buttonList = &buttonsRight;
-		buttonPosition = buttonsRight.begin();
+		buttonPosition = 0;
 	} else {
 		ButtonDropSiteItem *aboveItem = buttonAt(p);
 		if (!aboveItem)
 			return; // invalid drop. hasn't occurred _over_ a button (or left/right dropArea), return...
 
-		ButtonList::iterator it;
-		if (!getItemIterator(aboveItem, buttonList, it) ) {
+		int pos;
+		if (!getItemPos(aboveItem, buttonList, pos) ) {
 			// didn't find the aboveItem. unlikely to happen since buttonAt() already seems to have found
 			// something valid. anyway...
 			return;
@@ -410,12 +410,9 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
 
 		if (p.x() < aboveItemRect.left()+aboveItemRect.width()/2 ) {
 			// insert before the item
-			buttonPosition = it;
+			buttonPosition = pos;
 		} else {
-			if (it != buttonList->end() )
-				buttonPosition = ++it;
-			else
-				buttonPosition = it; // already at the end(), can't increment the iterator!
+			buttonPosition = pos + 1;
 		}
 	}
 
@@ -424,13 +421,18 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
 	ButtonDropSiteItem *buttonItem = 0;
 	if (e->source() == this && m_selected) {
 		ButtonList *oldList = 0;
-		ButtonList::iterator oldPos;
-		if (getItemIterator(m_selected, oldList, oldPos) ) {
-			if (oldPos == buttonPosition)
+		int oldPos;
+		if (getItemPos(m_selected, oldList, oldPos) ) {
+			if (oldPos == buttonPosition && oldList == buttonList)
 				return; // button didn't change its position during the drag...
 
-			oldList->erase(oldPos);
+			oldList->removeAt(oldPos);
 			buttonItem = m_selected;
+
+			// If we're inserting to the right of oldPos, in the same list, 
+            // better adjust the index..
+			if (buttonList == oldList && buttonPosition > oldPos)
+				--buttonPosition;
 		} else {
 			return; // m_selected not found, return...
 		}
@@ -452,26 +454,26 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
 	update();
 }
 
-bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list, ButtonList::iterator &iterator)
+bool ButtonDropSite::getItemPos(ButtonDropSiteItem *item, ButtonList* &list, int &pos)
 {
 	if (!item)
 		return false;
 
-	int ind = buttonsLeft.indexOf(item); // try the left list first...
-	if (ind < 0  ) {
-		ind = buttonsRight.indexOf(item); // try the right list...
-		if ( ind < 0 ) {
-			return false; // item hasn't been found in one of the list, return...
-		} else {
-			list = &buttonsRight;
-			iterator = buttonsRight.begin()+ind;
-		}
-	} else {
+	pos = buttonsLeft.indexOf(item); // try the left list first...
+	if (pos >= 0) {
 		list = &buttonsLeft;
-		buttonsLeft.begin()+ind;
+		return true;
 	}
 
-	return true;
+	pos = buttonsRight.indexOf(item); // try the right list...
+	if (pos >= 0) {
+		list = &buttonsRight;
+		return true;
+	}
+
+	list = 0;
+	pos  = -1;
+	return false;
 }
 
 QRect ButtonDropSite::leftDropArea()
@@ -600,7 +602,7 @@ void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int off
 	}
 }
 
-void ButtonDropSite::paintEvent( QPaintEvent* pe )
+void ButtonDropSite::paintEvent( QPaintEvent* /*pe*/ )
 {
 	QPainter p( this );
 	int leftoffset = calcButtonListWidth( buttonsLeft );
diff --git a/kcmkwin/kwindecoration/buttons.h b/kcmkwin/kwindecoration/buttons.h
index bc4902c11b..05411ad4d6 100644
--- a/kcmkwin/kwindecoration/buttons.h
+++ b/kcmkwin/kwindecoration/buttons.h
@@ -188,9 +188,9 @@ class ButtonDropSite: public QFrame
 
 	private:
 		/**
-		 * Try to find the item. If found, set its list and iterator and return true, else return false
+		 * Try to find the item. If found, set its list and index and return true, else return false
 		 */
-		bool getItemIterator(ButtonDropSiteItem *item, ButtonList* &list, ButtonList::iterator &iterator);
+		bool getItemPos(ButtonDropSiteItem *item, ButtonList* &list, int &pos);
 
 		void cleanDropVisualizer();
 		QRect m_oldDropVisualizer;