[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/qt-copy/src/gui/widgets
From:       Maks Orlovich <maksim () kde ! org>
Date:       2005-05-17 4:27:35
Message-ID: 1116304055.720717.15853.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 414850 by orlovich:

Trying to get not-at-the-end insertion in order:
QMenuBar: passing action to insert as before for insertAction can't work:
 Qt just isn't going to add it like that!
QMenu: off by ones, but perhaps there may be an internal action here sometimes?

This makes menus/menubar in katetest have sane order, and makes us not loose the bookmarks menu + 
makes that menu work.

P.S. Oh, tronical, qSort and qBubbleSort(why do we even use that?) crash on empty lists 

CCMAIL:hausmann@kde.org



 M  +2 -2      branches/work/kde4/qt-copy/src/gui/widgets/qmenu.cpp  
 M  +1 -1      branches/work/kde4/qt-copy/src/gui/widgets/qmenubar.cpp  


--- branches/work/kde4/qt-copy/src/gui/widgets/qmenu.cpp #414849:414850
@@ -2199,7 +2199,7 @@
     if (index == -1 || index >= actions().count())
         addAction(act);
     else
-        insertAction(actions().value(index+1), act);
+        insertAction(actions().value(index), act);
     return findIdForAction(act);
 }
 
@@ -2214,7 +2214,7 @@
     if (index == -1)
         addAction(act);
     else
-        insertAction(actions().value(index+1), act);
+        insertAction(actions().value(index), act);
     return findIdForAction(act);
 }
 
--- branches/work/kde4/qt-copy/src/gui/widgets/qmenubar.cpp #414849:414850
@@ -1373,7 +1373,7 @@
     if(index == -1 || index >= actions().size())
         addAction(act);
     else
-        insertAction(act, actions().value(index+1));
+        insertAction(actions().value(index), act);
     return findIdForAction(act);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]