[Traverso-commit] traverso/src commands/Import.cpp traverso/dialo...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/07 19:36:05

Modified files:
        src/commands   : Import.cpp 
        src/traverso/dialogs: InsertSilenceDialog.cpp 
        src/traverso   : Interface.cpp 

Log message:
        * QList assumes non empty list when calling last()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.121&r2=1.122

Patches:
Index: commands/Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- commands/Import.cpp 2 Jan 2008 19:23:58 -0000       1.33
+++ commands/Import.cpp 7 Jan 2008 19:36:05 -0000       1.34
@@ -145,7 +145,8 @@
        
        TimeRef startLocation;
        if (!m_hasPosition) {
-               if (AudioClip* lastClip = m_track->get_cliplist().last()) {
+               if (!m_track->get_cliplist().isEmpty()) {
+                       AudioClip* lastClip = m_track->get_cliplist().last();
                        startLocation = lastClip->get_track_end_location();
                }
        } else {

Index: traverso/dialogs/InsertSilenceDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/dialogs/InsertSilenceDialog.cpp    2 Jan 2008 19:23:59 -0000       
1.9
+++ traverso/dialogs/InsertSilenceDialog.cpp    7 Jan 2008 19:36:05 -0000       
1.10
@@ -72,7 +72,7 @@
                        Track*  shortestTrack = (Track*)tracks.first();
        
                        foreach(Track* track, tracks) {
-                               if (track->get_cliplist().last() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
+                               if (!track->get_cliplist().isEmpty() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
                                        shortestTrack = track;
                                }
                        }

Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- traverso/Interface.cpp      2 Jan 2008 19:23:59 -0000       1.121
+++ traverso/Interface.cpp      7 Jan 2008 19:36:05 -0000       1.122
@@ -1050,7 +1050,7 @@
                Track*  shortestTrack = tracks.first();
 
                foreach(Track* track, tracks) {
-                       if (track->get_cliplist().last() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
+                       if (!track->get_cliplist().isEmpty() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
                                shortestTrack = track;
                        }
                }