Deal with initialization defects (especially in ctors). From: Erik Hovland --- mythtv/programs/mythfrontend/mythappearance.cpp | 32 ++++++++------------ .../programs/mythfrontend/programrecpriority.cpp | 20 ++++++------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/mythtv/programs/mythfrontend/mythappearance.cpp b/mythtv/programs/mythfrontend/mythappearance.cpp index 8a38d00..3652a47 100644 --- a/mythtv/programs/mythfrontend/mythappearance.cpp +++ b/mythtv/programs/mythfrontend/mythappearance.cpp @@ -23,31 +23,23 @@ using namespace std; MythAppearance::MythAppearance(MythScreenStack *parent, const char *name) - : MythScreenType(parent, name) + : MythScreenType(parent, name), + m_x_offset(0), m_y_offset(0), + m_whicharrow(true), m_coarsefine(false), // fine adjustments by default + m_changed(false), m_fine(1), // fine moves arrows by one pixel + m_coarse(10), m_change(m_fine), // coarse moves arrows by ten pixels + m_topleftarrow_x(0), m_topleftarrow_y(0), + m_bottomrightarrow_x(0), m_bottomrightarrow_y(0), + m_arrowsize_x(30), m_arrowsize_y(30), // maybe get the image size later + m_screenheight(0), m_screenwidth(0), + m_xsize(GetMythMainWindow()->GetUIScreenRect().width()), + m_ysize(GetMythMainWindow()->GetUIScreenRect().height()), + m_menuPopup(NULL) { // Initialise $stuff // Get UI size & offset settings from database - - m_coarsefine = false; // fine adjustments by default - m_fine = 1; //fine moves arrows by one pixel - m_coarse = 10; // coarse moves arrows by ten pixels - m_change = m_fine; - m_screenheight = 0, m_screenwidth = 0; - m_arrowsize_x = 30; // maybe get the image size later - m_arrowsize_y = 30; // maybe get the image size later - m_topleftarrow_x = 0; - m_topleftarrow_y = 0; - - m_menuPopup = NULL; - m_changed = false; - getSettings(); getScreenInfo(); - m_whicharrow = true; - - m_xsize = GetMythMainWindow()->GetUIScreenRect().width(); - m_ysize = GetMythMainWindow()->GetUIScreenRect().height(); - } MythAppearance::~MythAppearance() {} diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp index 5cf780e..9da3ff8 100644 --- a/mythtv/programs/mythfrontend/programrecpriority.cpp +++ b/mythtv/programs/mythfrontend/programrecpriority.cpp @@ -32,20 +32,20 @@ using namespace std; // overloaded version of ProgramInfo with additional recording priority // values so we can keep everything together and don't // have to hit the db mulitiple times -ProgramRecPriorityInfo::ProgramRecPriorityInfo(void) : ProgramInfo() +ProgramRecPriorityInfo::ProgramRecPriorityInfo(void) + : ProgramInfo(), + recTypeRecPriority(0), recType(kNotRecording), + matchCount(0), recCount(0), + avg_delay(0), autoRecPriority(0) { - recTypeRecPriority = 0; - recType = kNotRecording; - avg_delay = 0; - autoRecPriority = 0; } + ProgramRecPriorityInfo::ProgramRecPriorityInfo(const ProgramRecPriorityInfo &other) - : ProgramInfo::ProgramInfo(other) + : ProgramInfo::ProgramInfo(other), + recTypeRecPriority(other.recTypeRecPriority), recType(other.recType), + matchCount(other.matchCount), recCount(other.recCount), + avg_delay(other.avg_delay), autoRecPriority(other.autoRecPriority) { - recTypeRecPriority = other.recTypeRecPriority; - recType = other.recType; - avg_delay = other.avg_delay; - autoRecPriority = other.autoRecPriority; } ProgramRecPriorityInfo& ProgramRecPriorityInfo::operator=(const ProgramInfo &other)