summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/colorpopupmenu.h6
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
@@ -39,36 +39,40 @@ public:
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
46signals: 46signals:
47 void selected(const QColor&); 47 void selected(const QColor&);
48 48
49private: 49private:
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
54class ColorPopupMenu : public QPopupMenu 56class ColorPopupMenu : public QPopupMenu
55{ 57{
56 Q_OBJECT 58 Q_OBJECT
57 59
58public: 60public:
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
62private: 64private:
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
69signals: 73signals:
70 void colorSelected( const QColor& color ); 74 void colorSelected( const QColor& color );
71 75
72protected slots: 76protected slots:
73 void buttonSelected( const QColor& color ); 77 void buttonSelected( const QColor& color );
74 void moreColorClicked(); 78 void moreColorClicked();