author | zecke <zecke> | 2002-04-26 15:59:02 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-26 15:59:02 (UTC) |
commit | b59a0401cf09669e05d3e68dd289ed0bb25ced6e (patch) (unidiff) | |
tree | 3f8fe4d247e78bfd542322cce0977f902c884e80 | |
parent | 429edaf407c4d92a280f103b8f85bed9cf14ea9b (diff) | |
download | opie-b59a0401cf09669e05d3e68dd289ed0bb25ced6e.zip opie-b59a0401cf09669e05d3e68dd289ed0bb25ced6e.tar.gz opie-b59a0401cf09669e05d3e68dd289ed0bb25ced6e.tar.bz2 |
Make it a bitfield and add a d pointer
-rw-r--r-- | libopie/colorpopupmenu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libopie/colorpopupmenu.h b/libopie/colorpopupmenu.h index 1206ac3..1a6ab08 100644 --- a/libopie/colorpopupmenu.h +++ b/libopie/colorpopupmenu.h | |||
@@ -27,51 +27,55 @@ | |||
27 | 27 | ||
28 | class QWidget; | 28 | class QWidget; |
29 | class QGridLayout; | 29 | class QGridLayout; |
30 | 30 | ||
31 | class ColorPanelButton : public QFrame | 31 | class ColorPanelButton : public QFrame |
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | 34 | ||
35 | public: | 35 | public: |
36 | ColorPanelButton(const QColor& color, QWidget* parent = 0, const char* name = 0); | 36 | ColorPanelButton(const QColor& color, QWidget* parent = 0, const char* name = 0); |
37 | ~ColorPanelButton(); | 37 | ~ColorPanelButton(); |
38 | 38 | ||
39 | void setActive(bool active); | 39 | void setActive(bool active); |
40 | 40 | ||
41 | void enterEvent(QEvent* e); | 41 | void enterEvent(QEvent* e); |
42 | void leaveEvent(QEvent* e); | 42 | void leaveEvent(QEvent* e); |
43 | void paintEvent(QPaintEvent* e); | 43 | void paintEvent(QPaintEvent* e); |
44 | void mouseReleaseEvent(QMouseEvent* e); | 44 | void mouseReleaseEvent(QMouseEvent* e); |
45 | 45 | ||
46 | signals: | 46 | signals: |
47 | void selected(const QColor&); | 47 | void selected(const QColor&); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | QColor m_color; | 50 | QColor m_color; |
51 | bool m_active; | 51 | bool m_active : 1; |
52 | class ColorPanelButtonPrivate; | ||
53 | ColorPanelButtonPrivate *d; | ||
52 | }; | 54 | }; |
53 | 55 | ||
54 | class ColorPopupMenu : public QPopupMenu | 56 | class ColorPopupMenu : public QPopupMenu |
55 | { | 57 | { |
56 | Q_OBJECT | 58 | Q_OBJECT |
57 | 59 | ||
58 | public: | 60 | public: |
59 | ColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ); | 61 | ColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ); |
60 | ~ColorPopupMenu(); | 62 | ~ColorPopupMenu(); |
61 | 63 | ||
62 | private: | 64 | private: |
65 | class ColorPopupMenuPrivate; | ||
66 | ColorPopupMenuPrivate *d; | ||
63 | QColor m_color; | 67 | QColor m_color; |
64 | QWidget* colorPanel; | 68 | QWidget* colorPanel; |
65 | QGridLayout* colorLayout; | 69 | QGridLayout* colorLayout; |
66 | 70 | ||
67 | void addColor( const QColor& color, int row, int col ); | 71 | void addColor( const QColor& color, int row, int col ); |
68 | 72 | ||
69 | signals: | 73 | signals: |
70 | void colorSelected( const QColor& color ); | 74 | void colorSelected( const QColor& color ); |
71 | 75 | ||
72 | protected slots: | 76 | protected slots: |
73 | void buttonSelected( const QColor& color ); | 77 | void buttonSelected( const QColor& color ); |
74 | void moreColorClicked(); | 78 | void moreColorClicked(); |
75 | }; | 79 | }; |
76 | 80 | ||
77 | #endif // COLORPOPUPMENUANEL_H | 81 | #endif // COLORPOPUPMENUANEL_H |