From b1c819c3238e94960154915f1ae14131fdb25cf8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 20 May 2013 18:32:37 -0500
Subject: [PATCH] Fix invalid toolbar data structure size declarations This
 cleans up a slew of Valgrind memcheck warnings

---
 tdeui/tdetoolbar.cpp       |  7 ++--
 tdeui/tdetoolbarbutton.cpp | 65 ++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index ad28c50f3..2eb90a813 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -88,6 +88,7 @@ public:
 
         m_enableContext  = true;
 
+        m_parent         = NULL;
         m_xmlguiClient   = 0;
 
         oldPos = TQt::DockUnmanaged;
@@ -225,7 +226,8 @@ TDEToolBar::~TDEToolBar()
 
 void TDEToolBar::init( bool readConfig, bool honorStyle )
 {
-    d = new TDEToolBarPrivate;
+    d = new TDEToolBarPrivate();
+
     setFullSize( true );
     d->m_honorStyle = honorStyle;
     context = 0;
@@ -1915,8 +1917,9 @@ void TDEToolBar::loadState( const TQDomElement &element )
     // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow,
     // but we do it only if there are toolbars...)
     // KDE4: move to TDEMainWindow
-    if ( transparentSetting() != !mw->opaqueMoving() )
+    if ( transparentSetting() != !mw->opaqueMoving() ) {
         mw->setOpaqueMoving( !transparentSetting() );
+    }
 }
 
 int TDEToolBar::dockWindowIndex()
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index abf23ffc7..791b47db1 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -53,8 +53,32 @@ template class TQIntDict<TDEToolBarButton>;
 class TDEToolBarButtonPrivate
 {
 public:
-  TDEToolBarButtonPrivate()
-  {
+  TDEToolBarButtonPrivate();
+  ~TDEToolBarButtonPrivate();
+
+  int     m_id;
+  bool    m_buttonDown;
+  bool    m_noStyle;
+  bool    m_isSeparator;
+  bool    m_isRadio;
+  bool    m_highlight;
+  bool    m_isRaised;
+  bool    m_isActive;
+
+  TQString m_iconName;
+
+  TDEToolBar *m_parent;
+  TDEToolBar::IconText m_iconText;
+  int m_iconSize;
+  TQSize size;
+
+  TQPoint m_mousePressPos;
+
+  TDEInstance  *m_instance;
+};
+
+TDEToolBarButtonPrivate::TDEToolBarButtonPrivate()
+{
     m_buttonDown  = false;
 
     m_noStyle     = false;
@@ -70,37 +94,18 @@ public:
 
     m_parent   = 0;
     m_instance = TDEGlobal::instance();
-  }
-  ~TDEToolBarButtonPrivate()
-  {
-  }
-
-  int     m_id;
-  bool    m_buttonDown : 1;
-  bool    m_noStyle: 1;
-  bool    m_isSeparator: 1;
-  bool    m_isRadio: 1;
-  bool    m_highlight: 1;
-  bool    m_isRaised: 1;
-  bool    m_isActive: 1;
-
-  TQString m_iconName;
-
-  TDEToolBar *m_parent;
-  TDEToolBar::IconText m_iconText;
-  int m_iconSize;
-  TQSize size;
-
-  TQPoint m_mousePressPos;
+}
 
-  TDEInstance  *m_instance;
-};
+TDEToolBarButtonPrivate::~TDEToolBarButtonPrivate()
+{
+    //
+}
 
 // This will construct a separator
 TDEToolBarButton::TDEToolBarButton( TQWidget *_parent, const char *_name )
   : TQToolButton( _parent , _name)
 {
-  d = new TDEToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate();
 
   resize(6,6);
   hide();
@@ -112,7 +117,7 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id,
                                 const TQString &_txt, TDEInstance *_instance )
     : TQToolButton( _parent, _name ), d( 0 )
 {
-  d = new TDEToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate();
 
   d->m_id     = _id;
   TQToolButton::setTextLabel(_txt);
@@ -146,7 +151,7 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id,
                                 const TQString& txt)
     : TQToolButton( _parent, name ), d( 0 )
 {
-  d = new TDEToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate();
 
   d->m_id       = _id;
   TQToolButton::setTextLabel(txt);
@@ -507,7 +512,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter )
   {
     TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? TQIconSet::Active : TQIconSet::Normal) :
-            	TQIconSet::Disabled,
+               TQIconSet::Disabled,
         isOn() ? TQIconSet::On : TQIconSet::Off );
     if( !pixmap.isNull())
     {