author | zecke <zecke> | 2004-09-12 23:47:11 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-12 23:47:11 (UTC) |
commit | 03d8f31d45fa569d944ff635428ad9a946f077b9 (patch) (unidiff) | |
tree | 9e1bdc54778581577a16be570c133a9693b4a47d | |
parent | f05a19bd1e248ea8cea29d361a1a8085ca145c6a (diff) | |
download | opie-03d8f31d45fa569d944ff635428ad9a946f077b9.zip opie-03d8f31d45fa569d944ff635428ad9a946f077b9.tar.gz opie-03d8f31d45fa569d944ff635428ad9a946f077b9.tar.bz2 |
OColorButton::~OColorButton ( )
{
+ delete d->m_menu;
delete d;
}
That was a tricky one to find. If a dynamically loaded shared object (dso)
creates QObjects/QWidgets on the destruction of QApplication they will
be freed. For normal applications these dso's have already been removed
from the address-space leading to calling delete to or from a bogus
part of memory leading to segfaults
-rw-r--r-- | libqtaux/ocolorbutton.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libqtaux/ocolorbutton.cpp b/libqtaux/ocolorbutton.cpp index 925df7f..004fafc 100644 --- a/libqtaux/ocolorbutton.cpp +++ b/libqtaux/ocolorbutton.cpp | |||
@@ -28,96 +28,97 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "ocolorpopupmenu.h" | 30 | #include "ocolorpopupmenu.h" |
31 | #include "ocolorbutton.h" | 31 | #include "ocolorbutton.h" |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | 34 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qimage.h> | 36 | #include <qimage.h> |
37 | 37 | ||
38 | using namespace Opie; | 38 | using namespace Opie; |
39 | 39 | ||
40 | struct OColorButtonPrivate | 40 | struct OColorButtonPrivate |
41 | { | 41 | { |
42 | QPopupMenu *m_menu; | 42 | QPopupMenu *m_menu; |
43 | QColor m_color; | 43 | QColor m_color; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * This concstructs a Color Button with @param color as the start color | 47 | * This concstructs a Color Button with @param color as the start color |
48 | * It'll use a OColorPopupMenu internally | 48 | * It'll use a OColorPopupMenu internally |
49 | * | 49 | * |
50 | * @param parent The parent of the Color Button | 50 | * @param parent The parent of the Color Button |
51 | * @param color The color from where to start on | 51 | * @param color The color from where to start on |
52 | * @param name @see QObject | 52 | * @param name @see QObject |
53 | */ | 53 | */ |
54 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) | 54 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) |
55 | : QPushButton ( parent, name ) | 55 | : QPushButton ( parent, name ) |
56 | { | 56 | { |
57 | d = new OColorButtonPrivate; | 57 | d = new OColorButtonPrivate; |
58 | 58 | ||
59 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); | 59 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); |
60 | setPopup ( d-> m_menu ); | 60 | setPopup ( d-> m_menu ); |
61 | //setPopupDelay ( 0 ); | 61 | //setPopupDelay ( 0 ); |
62 | connect ( d-> m_menu, SIGNAL( colorSelected(const QColor&)), this, SLOT( updateColor(const QColor&))); | 62 | connect ( d-> m_menu, SIGNAL( colorSelected(const QColor&)), this, SLOT( updateColor(const QColor&))); |
63 | 63 | ||
64 | 64 | ||
65 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); | 65 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); |
66 | setMinimumSize ( s ); | 66 | setMinimumSize ( s ); |
67 | setMaximumSize ( s. width ( ) * 2, s. height ( )); | 67 | setMaximumSize ( s. width ( ) * 2, s. height ( )); |
68 | d->m_color = color; | 68 | d->m_color = color; |
69 | } | 69 | } |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * This destructs the object | 72 | * This destructs the object |
73 | */ | 73 | */ |
74 | OColorButton::~OColorButton ( ) | 74 | OColorButton::~OColorButton ( ) |
75 | { | 75 | { |
76 | delete d->m_menu; | ||
76 | delete d; | 77 | delete d; |
77 | } | 78 | } |
78 | 79 | ||
79 | /** | 80 | /** |
80 | * @return Returns the current color of the button | 81 | * @return Returns the current color of the button |
81 | */ | 82 | */ |
82 | QColor OColorButton::color ( ) const | 83 | QColor OColorButton::color ( ) const |
83 | { | 84 | { |
84 | return d-> m_color; | 85 | return d-> m_color; |
85 | } | 86 | } |
86 | 87 | ||
87 | /** | 88 | /** |
88 | * This method sets the color of the button | 89 | * This method sets the color of the button |
89 | * @param c The color to be set. | 90 | * @param c The color to be set. |
90 | */ | 91 | */ |
91 | void OColorButton::setColor ( const QColor &c ) | 92 | void OColorButton::setColor ( const QColor &c ) |
92 | { | 93 | { |
93 | updateColor ( c ); | 94 | updateColor ( c ); |
94 | } | 95 | } |
95 | 96 | ||
96 | /** | 97 | /** |
97 | * @internal | 98 | * @internal |
98 | */ | 99 | */ |
99 | void OColorButton::updateColor ( const QColor &c ) | 100 | void OColorButton::updateColor ( const QColor &c ) |
100 | { | 101 | { |
101 | d-> m_color = c; | 102 | d-> m_color = c; |
102 | 103 | ||
103 | QImage img ( width()-14, height()-6, 32 ); | 104 | QImage img ( width()-14, height()-6, 32 ); |
104 | img. fill ( 0 ); | 105 | img. fill ( 0 ); |
105 | 106 | ||
106 | int r, g, b; | 107 | int r, g, b; |
107 | c. rgb ( &r, &g, &b ); | 108 | c. rgb ( &r, &g, &b ); |
108 | 109 | ||
109 | int w = img. width ( ); | 110 | int w = img. width ( ); |
110 | int h = img. height ( ); | 111 | int h = img. height ( ); |
111 | 112 | ||
112 | int dx = w * 20 / 100; // 15% | 113 | int dx = w * 20 / 100; // 15% |
113 | int dy = h * 20 / 100; | 114 | int dy = h * 20 / 100; |
114 | 115 | ||
115 | for ( int y = 0; y < h; y++ ) | 116 | for ( int y = 0; y < h; y++ ) |
116 | { | 117 | { |
117 | for ( int x = 0; x < w; x++ ) | 118 | for ( int x = 0; x < w; x++ ) |
118 | { | 119 | { |
119 | double alpha = 1.0; | 120 | double alpha = 1.0; |
120 | 121 | ||
121 | if ( x < dx ) | 122 | if ( x < dx ) |
122 | alpha *= ( double ( x + 1 ) / dx ); | 123 | alpha *= ( double ( x + 1 ) / dx ); |
123 | else if ( x >= w - dx ) | 124 | else if ( x >= w - dx ) |