Changeset 15

Timestamp:

12/29/07 16:53:59 (4 years ago)

Author:

sander

Message:

Some minor things and a memleak

Files:

• gui/playlisttablemodel.cpp (modified) (4 diffs)
• gui/playlisttablemodel.h (modified) (2 diffs)
• lib/song.cpp (modified) (1 diff)
• lib/song.h (modified) (1 diff)

gui/playlisttablemodel.cpp

@@ -6 +6 @@
 {
     songs = new QList<Song *>;
-    song_id = 0;
+    song_id = -1;
 }
 
@@ -77 +77 @@
 void PlaylistTableModel::updateCurrentSong(quint32 id)
 {
-    quint32 oldIndex = 0;
+    qint32 oldIndex = -1;
 
     oldIndex = song_id;
     song_id = id;
 
-    if(oldIndex != 0)
+    if(oldIndex != -1)
         emit dataChanged(index(songIdToRow(oldIndex), 0), index(songIdToRow(oldIndex), 2));
 
@@ -91 +91 @@
 {
     // Update song list and refresh model
+    while(this->songs->size())
+        delete this->songs->takeLast();
+
     delete this->songs;
+
     this->songs = songs;
     reset();
 }
 
-quint32 PlaylistTableModel::getIdByRow(quint32 row) const
+qint32 PlaylistTableModel::getIdByRow(qint32 row) const
 {
     if(songs->size() <= row) {
@@ -105 +109 @@
 }
 
-qint32 PlaylistTableModel::songIdToRow(quint32 id)
+qint32 PlaylistTableModel::songIdToRow(qint32 id)
 {
     for(qint32 i = 0; i < songs->size(); i++) {

gui/playlisttablemodel.h

@@ -19 +19 @@
         QVariant data(const QModelIndex &, int) const;
         void updateCurrentSong(quint32 id);
-        quint32 getIdByRow(quint32 row) const;
+        qint32 getIdByRow(qint32 row) const;
 
     public slots:
@@ -26 +26 @@
     private:
         QList<Song *> *songs;
-        quint32 song_id;
+        qint32 song_id;
 
-        qint32 songIdToRow(quint32 id);
+        qint32 songIdToRow(qint32 id);
 };
 

lib/song.cpp

@@ -3 +3 @@
 Song::Song()
 {
-    id = 0;
+    id = -1;
     time = 0;
     track = 0;

lib/song.h

@@ -8 +8 @@
 {
     public:
-        quint32 id;
+        qint32 id;
         QString file;
         quint32 time;