From 35fb11c7643f9ad41949b7a6d58ec633d620d634 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 22 Mar 2011 22:39:40 -0400 Subject: [PATCH] More effective-to-some fixes. --- src/MusicWheelItem.cpp | 14 ++++++-------- src/MusicWheelItem.h | 7 +++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/MusicWheelItem.cpp b/src/MusicWheelItem.cpp index df198ef22a..3ecf7d81d3 100644 --- a/src/MusicWheelItem.cpp +++ b/src/MusicWheelItem.cpp @@ -33,14 +33,12 @@ static const char *MusicWheelItemTypeNames[] = { }; XToString( MusicWheelItemType ); -MusicWheelItemData::MusicWheelItemData( WheelItemDataType type, Song* pSong, RString sSectionName, Course* pCourse, RageColor color, int iSectionCount ): - WheelItemBaseData(type, sSectionName, color) -{ - m_pSong = pSong; - m_pCourse = pCourse; - m_Flags = WheelNotifyIcon::Flags(); - m_iSectionCount = iSectionCount; -} +MusicWheelItemData::MusicWheelItemData( WheelItemDataType type, Song* pSong, + RString sSectionName, Course* pCourse, + RageColor color, int iSectionCount ): + WheelItemBaseData(type, sSectionName, color), + m_pCourse(pCourse), m_pSong(pSong), m_Flags(WheelNotifyIcon::Flags()), + m_iSectionCount(iSectionCount), m_sLabel(""), m_pAction() {} MusicWheelItem::MusicWheelItem( RString sType ): WheelItemBase( sType ) diff --git a/src/MusicWheelItem.h b/src/MusicWheelItem.h index 1d83357b5e..6155e24d70 100644 --- a/src/MusicWheelItem.h +++ b/src/MusicWheelItem.h @@ -62,8 +62,11 @@ private: struct MusicWheelItemData : public WheelItemBaseData { - MusicWheelItemData() : m_iSectionCount(0) { } - MusicWheelItemData( WheelItemDataType type, Song* pSong, RString sSectionName, Course* pCourse, RageColor color, int iSectionCount ); + MusicWheelItemData() : m_pCourse(NULL), m_pSong(NULL), m_Flags(), + m_iSectionCount(0), m_sLabel(""), m_pAction() { } + MusicWheelItemData( WheelItemDataType type, Song* pSong, + RString sSectionName, Course* pCourse, + RageColor color, int iSectionCount ); Course* m_pCourse; Song* m_pSong;