Ticket #5676: libs_libmythui-uninit.patch

mythtv/libs/libmythui/jsmenu.cpp

@@ -51 +51 @@
 ** JoystickMenuThread Constructor
 **--------------------------------------------------------------------------*/
 JoystickMenuThread::JoystickMenuThread(QObject *main_window)
-                  : QThread()
+    : QThread(),
+      mainWindow(main_window), devicename(""),
+      fd(-1),                  button_count(0),
+      axes_count(0),           buttons(NULL),
+      axes(NULL),              bStop(false)
 {
-    mainWindow = main_window;
-
-    fd = -1;
-    axes = NULL;
-    buttons = NULL;
-    bStop = false;
 }
 
 /*----------------------------------------------------------------------------

mythtv/libs/libmythui/lirc.cpp

@@ -24 +24 @@
  */
 
 LircThread::LircThread(QObject *main_window)
-          : QThread()
+    : QThread(),
+      lircConfig(NULL), mainWindow(main_window),
+      bStop(false),     fd(-1),
+      external_app("")
 {
-    mainWindow = main_window;
-    bStop = false;
-    lircConfig = NULL;
 }
 
 int LircThread::Init(const QString &config_file, const QString &program,

mythtv/libs/libmythui/mythgenerictree.cpp

@@ -99 +99 @@
 };
 
 ///////////////////////////////////////////////////////
+// Use 6 here, because we know that's what mythmusic wants (limits resizing)
+const unsigned int MythGenericTree::kDefaultVectorSize = 6;
 
 MythGenericTree::MythGenericTree(const QString &a_string, int an_int,
-                         bool selectable_flag)
+                                 bool selectable_flag)
+    : m_string(a_string),       m_int(an_int),
+      m_subnodes(new SortableMythGenericTreeList),
+      m_ordered_subnodes(new SortableMythGenericTreeList),
+      m_flatenedSubnodes(new SortableMythGenericTreeList),
+      m_selected_subnode(NULL), m_attributes(new IntVector(kDefaultVectorSize)),
+      m_parent(NULL),           m_selectable(selectable_flag),
+      m_visible(false),         m_currentOrderingIndex(-1)
 {
-    m_subnodes = new SortableMythGenericTreeList;
-    m_ordered_subnodes = new SortableMythGenericTreeList;
-    m_flatenedSubnodes = new SortableMythGenericTreeList;
-
-    m_parent = NULL;
-    m_selected_subnode = NULL;
-    m_currentOrderingIndex = -1;
-
-    // Use 6 here, because we know that's what mythmusic wants (limits resizing)
-    m_attributes = new IntVector(6);
-
-    m_string = a_string;
-    m_int = an_int;
-    m_selectable = selectable_flag;
 }
 
 MythGenericTree::~MythGenericTree()

mythtv/libs/libmythui/mythgenerictree.h

@@ -101 +101 @@
   private:
     void reorderSubnodes(void);
 
+    static const unsigned int kDefaultVectorSize;
+
     QString m_string;
     int m_int;
     QVariant m_data;

mythtv/libs/libmythui/mythuiprogressbar.cpp

@@ -10 +10 @@
 #include "mythuiprogressbar.h"
 
 MythUIProgressBar::MythUIProgressBar(MythUIType *parent, const QString &name)
-           : MythUIType(parent, name)
+    : MythUIType(parent, name),
+      m_layout(LayoutHorizontal), m_effect(EffectReveal),
+      m_initialized(false),       m_total(0),
+      m_start(0),                 m_current(0)
 {
-    m_layout = LayoutHorizontal;
-    m_effect = EffectReveal;
-
-    m_total = m_start = m_current = 0;
-}
-
-MythUIProgressBar::~MythUIProgressBar()
-{
-
 }
 
 bool MythUIProgressBar::ParseElement(QDomElement &element)

mythtv/libs/libmythui/mythuiprogressbar.h

@@ -15 +15 @@
 {
   public:
     MythUIProgressBar(MythUIType *parent, const QString &name);
-   ~MythUIProgressBar();
+   ~MythUIProgressBar() { }
 
     enum LayoutType { LayoutVertical, LayoutHorizontal };
     enum EffectType { EffectReveal, EffectSlide, EffectAnimate };

mythtv/libs/libmythui/mythuitext.cpp

@@ -12 +12 @@
 #include "compat.h"
 
 MythUIText::MythUIText(MythUIType *parent, const QString &name)
-          : MythUIType(parent, name)
+    : MythUIType(parent, name),
+      m_Justification(Qt::AlignLeft | Qt::AlignTop), m_OrigDisplayRect(),
+      m_AltDisplayRect(),                            m_drawRect(),
+      m_Message(""),                                 m_CutMessage(""),
+      m_DefaultMessage(""),                          m_Cutdown(true),
+      m_Font(new MythFontProperties()),              m_colorCycling(false),
+      m_startColor(),                                m_endColor(),
+      m_numSteps(0),                                 m_curStep(0),
+      curR(0.0),              curG(0.0),             curB(0.0),
+      incR(0.0),              incG(0.0),             incB(0.0)
 {
-    m_Message = m_DefaultMessage = "";
-
-    m_Font = new MythFontProperties();
-
-    m_OrigDisplayRect = m_AltDisplayRect = m_Area = m_drawRect = MythRect();
-
-    m_Cutdown = true;
-    m_CutMessage = "";
-
-    m_Justification = (Qt::AlignLeft | Qt::AlignTop);
-
-    m_colorCycling = false;
+    // This is a part of a parent object (it should be set in that ctor)
+    m_Area = MythRect();
 }
 
 MythUIText::MythUIText(const QString &text, const MythFontProperties &font,
                        QRect displayRect, QRect altDisplayRect,
                        MythUIType *parent, const QString &name)
-          : MythUIType(parent, name)
+    : MythUIType(parent, name),
+      m_Justification(Qt::AlignLeft | Qt::AlignTop),
+      m_OrigDisplayRect(displayRect), m_AltDisplayRect(altDisplayRect),
+      m_drawRect(displayRect),        m_Message(text),
+      m_CutMessage(""),               m_DefaultMessage(text),
+      m_Cutdown(true),                m_Font(new MythFontProperties()),
+      m_colorCycling(false),          m_startColor(),
+      m_endColor(),                   m_numSteps(0),
+      m_curStep(0),
+      curR(0.0),      curG(0.0),      curB(0.0),
+      incR(0.0),      incG(0.0),      incB(0.0)
 {
-    m_Message = text;
-    m_DefaultMessage = text;
-
-    m_Font = new MythFontProperties();
     *m_Font = font;
-
-    m_OrigDisplayRect = m_Area = m_drawRect = displayRect;
-    m_AltDisplayRect = altDisplayRect;
-
-    m_Cutdown = true;
-    m_CutMessage = "";
-    m_Justification = (Qt::AlignLeft | Qt::AlignTop);
-
-    m_colorCycling = false;
+    // This is a part of a parent object (it should be set in that ctor)
+    m_Area = displayRect;
 }
 
 MythUIText::~MythUIText()

mythtv/libs/libmythui/mythuiwebbrowser.cpp

@@ -147 +147 @@
  *  \param name the name of this widget
  */
 MythUIWebBrowser::MythUIWebBrowser(MythUIType *parent, const QString &name)
-                : MythUIType(parent, name)
+    : MythUIType(parent, name),
+#ifdef USING_QTWEBKIT
+      m_browser(NULL),
+#endif
+      m_image(NULL),         m_active(false),
+      m_initialized(false),  m_zoom(1.0),
+      m_bgColor("White"),    m_inputToggled(false),
+      m_lastMouseAction(""), m_mouseKeyCount(0),
+      m_lastMouseActionTime()
 {
-    m_zoom = 1.0;
-    m_bgColor = QColor("white");
-    m_image = NULL;
-    m_browser = NULL;
-
-    m_initialized = false;
-    m_active = false;
-    m_inputToggled = false;
-
     SetCanTakeFocus(true);
 }
 
 void MythUIWebBrowser::Finalize(void)
 {
     Init();
-
     MythUIType::Finalize();
 }