Initialise member variables in SearchView. Reported by cppcheck

MythTV · Jan 30, 2012 · cb03390 · cb03390
1 parent 30ee762
commit cb03390
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
@@ -24,7 +24,7 @@
 
 MusicGenericTree::MusicGenericTree(MusicGenericTree *parent,
                                    const QString &name, const QString &action,
-                                   MythUIButtonListItem::CheckState check, 
+                                   MythUIButtonListItem::CheckState check,
                                    bool showArrow)
                  : MythGenericTree(name)
 {
@@ -89,14 +89,11 @@ MythUIButtonListItem *MusicGenericTree::CreateListButton(MythUIButtonList *list)
 #define LOC_ERR  QString("PlaylistEditorView, Error: ")
 
 PlaylistEditorView::PlaylistEditorView(MythScreenStack *parent, const QString &layout, bool restorePosition)
-         :MusicCommon(parent, "playlisteditorview")
+         :MusicCommon(parent, "playlisteditorview"),
+            m_layout(layout), m_restorePosition(restorePosition),
+            m_rootNode(NULL), m_playlistTree(NULL), m_breadcrumbsText(NULL),
+            m_positionText(NULL)
 {
-    m_rootNode = NULL;
-    m_playlistTree = NULL;
-
-    m_layout = layout;
-    m_restorePosition = restorePosition;
-
     gCoreContext->SaveSetting("MusicPlaylistEditorView", layout);
 }
 
@@ -161,11 +158,11 @@ bool PlaylistEditorView::Create(void)
         restoreTreePosition(route);
     }
 
-    connect(m_playlistTree, SIGNAL(itemClicked(MythUIButtonListItem*)), 
+    connect(m_playlistTree, SIGNAL(itemClicked(MythUIButtonListItem*)),
             this, SLOT(treeItemClicked(MythUIButtonListItem*)));
-    connect(m_playlistTree, SIGNAL(nodeChanged(MythGenericTree*)), 
+    connect(m_playlistTree, SIGNAL(nodeChanged(MythGenericTree*)),
             this, SLOT(treeNodeChanged(MythGenericTree*)));
-    connect(m_playlistTree, SIGNAL(itemVisible(MythUIButtonListItem*)), 
+    connect(m_playlistTree, SIGNAL(itemVisible(MythUIButtonListItem*)),
             this, SLOT(treeItemVisible(MythUIButtonListItem*)));
 
     BuildFocusList();
@@ -306,7 +303,7 @@ bool PlaylistEditorView::keyPressEvent(QKeyEvent *event)
                         QString name = mnode->getString();
 
                         ShowOkPopup(QString("Are you sure you want to delete this Smart Playlist?\n"
-                                            "Category: %1 - Name: %2").arg(category).arg(name), 
+                                            "Category: %1 - Name: %2").arg(category).arg(name),
                                     this, SLOT(deleteSmartPlaylist(bool)), true);
                         handled = true;
                     }
@@ -315,7 +312,7 @@ bool PlaylistEditorView::keyPressEvent(QKeyEvent *event)
                         QString name = mnode->getString();
 
                         ShowOkPopup(QString("Are you sure you want to delete this Playlist?\n"
-                                            "Name: %1").arg(name), 
+                                            "Name: %1").arg(name),
                                     this, SLOT(deletePlaylist(bool)), true);
                         handled = true;
                     }
@@ -723,7 +720,7 @@ void PlaylistEditorView::filterTracks(MusicGenericTree *node)
             Metadata *mdata = tracks->at(x);
             if (mdata)
             {
-                QString ratingStr = tr("%n Star(s)", "", mdata->Rating()); 
+                QString ratingStr = tr("%n Star(s)", "", mdata->Rating());
                 if (map.contains(ratingStr))
                 {
                     MetadataPtrList *filteredTracks = map.value(ratingStr);
@@ -780,7 +777,7 @@ void PlaylistEditorView::filterTracks(MusicGenericTree *node)
         }
 
     }
-    else if (node->getAction() == "artist" || node->getAction() == "album" || 
+    else if (node->getAction() == "artist" || node->getAction() == "album" ||
              node->getAction() == "genre" || node->getAction() == "rating" ||
              node->getAction() == "year")
     {

diff --git a/mythplugins/mythmusic/mythmusic/searchview.cpp b/mythplugins/mythmusic/mythmusic/searchview.cpp
@@ -15,9 +15,10 @@
 #include "searchview.h"
 
 SearchView::SearchView(MythScreenStack *parent)
-         :MusicCommon(parent, "searchview")
+         :MusicCommon(parent, "searchview"),
+            m_playTrack(false), m_fieldList(NULL), m_criteriaEdit(NULL),
+            m_matchesText(NULL), m_tracksList(NULL)
 {
-    m_playTrack = false;
     m_currentView = MV_SEARCH;
 }
 
@@ -71,7 +72,7 @@ bool SearchView::Create(void)
     connect(m_tracksList, SIGNAL(itemClicked(MythUIButtonListItem*)),
             this, SLOT(trackClicked(MythUIButtonListItem*)));
 
-    connect(m_tracksList, SIGNAL(itemVisible(MythUIButtonListItem*)), 
+    connect(m_tracksList, SIGNAL(itemVisible(MythUIButtonListItem*)),
             this, SLOT(trackVisible(MythUIButtonListItem*)));
 
     connect(m_criteriaEdit, SIGNAL(valueChanged()), this, SLOT(criteriaChanged()));
@@ -376,7 +377,7 @@ void SearchView::updateTracksList(void)
                 //TODO add tag query
             }
             case 0: // all fields
-            default: 
+            default:
             {
                 sql = "SELECT song_id "
                       "FROM music_songs "