[Valgrind-valkyrie-dev] valkyrie: r501 - in branches/valkyrie_qt4port: . help

[<sv...@va...>]

Author: cerion
Date: 2010-09-03 04:34:59 +0100 (Fri, 03 Sep 2010)
New Revision: 501

Log:
minor tweaks

Modified:
   branches/valkyrie_qt4port/help/help_handbook.cpp
   branches/valkyrie_qt4port/mainwindow.cpp


Modified: branches/valkyrie_qt4port/help/help_handbook.cpp
===================================================================
--- branches/valkyrie_qt4port/help/help_handbook.cpp	2010-09-03 03:34:26 UTC (rev 500)
+++ branches/valkyrie_qt4port/help/help_handbook.cpp	2010-09-03 03:34:59 UTC (rev 501)
@@ -157,7 +157,7 @@
    //  - count how many actions from there
    //  - remove that first action if necessary
    int nActsBefore = 0;
-   QAction* actFirst;
+   QAction* actFirst = 0;
    foreach( actFirst, bookmarkMenu->actions() ) {
       // skip non-bookmark actions
       if ( actFirst->objectName() == QString::fromUtf8( "handbook_actBookmark" ) ) {
@@ -168,6 +168,7 @@
    }
    
    if (( bookmarkMenu->actions().count() - nActsBefore ) > max_bookmarks ) {
+      vk_assert( actFirst );
       bookmarkMenu->removeAction( actFirst );
       delete actFirst;
    }

Modified: branches/valkyrie_qt4port/mainwindow.cpp
===================================================================
--- branches/valkyrie_qt4port/mainwindow.cpp	2010-09-03 03:34:26 UTC (rev 500)
+++ branches/valkyrie_qt4port/mainwindow.cpp	2010-09-03 03:34:59 UTC (rev 501)
@@ -369,6 +369,7 @@
    menuFile->addAction( actFile_OpenProj );
    menuFile->addSeparator();
    menuFile->addAction( actFile_Close );
+   menuFile->addSeparator();
    menuFile->addAction( actFile_Exit );
    
    menuEdit->addAction( actEdit_Options );