diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-20 18:32:37 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-30 13:41:49 +0200 |
commit | 6eac96c4dd6fc80088193e53801ad3da957e4138 (patch) | |
tree | 2a34e0a96f3127d422859e25bbe6110fa9982625 /kdeui/ktoolbarbutton.cpp | |
parent | aaa6198c4f2a1f7974e45b57524bbd4d8bfa40aa (diff) | |
download | tdelibs-6eac96c4dd6fc80088193e53801ad3da957e4138.tar.gz tdelibs-6eac96c4dd6fc80088193e53801ad3da957e4138.zip |
Fix invalid toolbar data structure size declarations
This cleans up a slew of Valgrind memcheck warnings
(cherry picked from commit b1c819c3238e94960154915f1ae14131fdb25cf8)
Diffstat (limited to 'kdeui/ktoolbarbutton.cpp')
-rw-r--r-- | kdeui/ktoolbarbutton.cpp | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp index a2d3c27fe..ac0b8ba7e 100644 --- a/kdeui/ktoolbarbutton.cpp +++ b/kdeui/ktoolbarbutton.cpp @@ -53,8 +53,32 @@ template class TQIntDict<KToolBarButton>; class KToolBarButtonPrivate { public: - KToolBarButtonPrivate() - { + KToolBarButtonPrivate(); + ~KToolBarButtonPrivate(); + + 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; + + KToolBar *m_parent; + KToolBar::IconText m_iconText; + int m_iconSize; + TQSize size; + + TQPoint m_mousePressPos; + + KInstance *m_instance; +}; + +KToolBarButtonPrivate::KToolBarButtonPrivate() +{ m_buttonDown = false; m_noStyle = false; @@ -70,37 +94,18 @@ public: m_parent = 0; m_instance = KGlobal::instance(); - } - ~KToolBarButtonPrivate() - { - } - - 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; - - KToolBar *m_parent; - KToolBar::IconText m_iconText; - int m_iconSize; - TQSize size; - - TQPoint m_mousePressPos; +} - KInstance *m_instance; -}; +KToolBarButtonPrivate::~KToolBarButtonPrivate() +{ + // +} // This will construct a separator KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name ) : TQToolButton( _parent , _name) { - d = new KToolBarButtonPrivate; + d = new KToolBarButtonPrivate(); resize(6,6); hide(); @@ -112,7 +117,7 @@ KToolBarButton::KToolBarButton( const TQString& _icon, int _id, const TQString &_txt, KInstance *_instance ) : TQToolButton( _parent, _name ), d( 0 ) { - d = new KToolBarButtonPrivate; + d = new KToolBarButtonPrivate(); d->m_id = _id; TQToolButton::setTextLabel(_txt); @@ -146,7 +151,7 @@ KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id, const TQString& txt) : TQToolButton( _parent, name ), d( 0 ) { - d = new KToolBarButtonPrivate; + d = new KToolBarButtonPrivate(); d->m_id = _id; TQToolButton::setTextLabel(txt); @@ -507,7 +512,7 @@ void KToolBarButton::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()) { |