aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-28 16:58:36 (GMT)
committerfluxgen <fluxgen>2002-04-28 16:58:36 (GMT)
commit86c9f77aa2da00c61583068420378b9e5c12aa55 (patch)
treed53207568e3eb0cd2cab0cc9647af6bf8ae3c733 /src
parent60231936357b4258a832e824408f579490ab54f6 (diff)
downloadfluxbox-86c9f77aa2da00c61583068420378b9e5c12aa55.zip
fluxbox-86c9f77aa2da00c61583068420378b9e5c12aa55.tar.bz2
indentation and const fix
Diffstat (limited to 'src')
-rw-r--r--src/Configmenu.hh109
1 files changed, 55 insertions, 54 deletions
diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 912777f..2e25860 100644
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -22,10 +22,10 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Configmenu.hh,v 1.4 2002/04/03 12:08:54 fluxgen Exp $ 25// $Id: Configmenu.hh,v 1.5 2002/04/28 16:58:36 fluxgen Exp $
26 26
27#ifndef CONFIGMENU_HH 27#ifndef CONFIGMENU_HH
28#define CONFIGMENU_HH 28#define CONFIGMENU_HH
29 29
30// forward declaration 30// forward declaration
31class Configmenu; 31class Configmenu;
@@ -36,63 +36,64 @@ class Configmenu;
36 36
37class Configmenu : public Basemenu { 37class Configmenu : public Basemenu {
38private: 38private:
39 class Focusmenu : public Basemenu { 39 class Focusmenu : public Basemenu {
40 private: 40 public:
41 Configmenu *configmenu; 41 Focusmenu(Configmenu *);
42 42 protected:
43 protected: 43 virtual void itemSelected(int button, unsigned int index);
44 virtual void itemSelected(int button, unsigned int index); 44
45 45 private:
46 public: 46 Configmenu *configmenu;
47 Focusmenu(Configmenu *); 47
48 }; 48 };
49 49
50 class Placementmenu : public Basemenu { 50 class Placementmenu : public Basemenu {
51 private: 51 public:
52 Configmenu *configmenu; 52 Placementmenu(Configmenu *);
53 53
54 protected: 54 protected:
55 virtual void itemSelected(int button, unsigned int index); 55 virtual void itemSelected(int button, unsigned int index);
56 56
57 public: 57 private:
58 Placementmenu(Configmenu *); 58 Configmenu *configmenu;
59 }; 59 };
60 60
61 class Tabmenu : public Basemenu { 61 class Tabmenu : public Basemenu {
62 private: 62 public:
63 Configmenu *configmenu; 63 Tabmenu(Configmenu *);
64 void setSelected(void); 64 protected:
65 protected: 65 virtual void itemSelected(int button, unsigned int index);
66 virtual void itemSelected(int button, unsigned int index); 66 private:
67 67 Configmenu *configmenu;
68 public: 68 void setSelected();
69 Tabmenu(Configmenu *); 69 };
70 }; 70
71 71 BScreen *screen;
72// Fluxbox *fluxbox; 72 Focusmenu *focusmenu;
73 BScreen *screen; 73 Placementmenu *placementmenu;
74 Focusmenu *focusmenu; 74 Tabmenu *tabmenu;
75 Placementmenu *placementmenu; 75
76 Tabmenu *tabmenu; 76 friend class Focusmenu;
77 77 friend class Placementmenu;
78 friend class Focusmenu; 78 friend class Tabmenu;
79 friend class Placementmenu;
80 friend class Tabmenu;
81 79
82 80
83protected: 81protected:
84 virtual void itemSelected(int button, unsigned int index); 82 virtual void itemSelected(int button, unsigned int index);
85 83
86 84
87public: 85public:
88 Configmenu(BScreen *); 86 Configmenu(BScreen *);
89 virtual ~Configmenu(void); 87 virtual ~Configmenu();
90 88 inline Basemenu *getFocusmenu() { return focusmenu; }
91 inline Basemenu *getFocusmenu(void) { return focusmenu; } 89 inline Basemenu *getPlacementmenu() { return placementmenu; }
92 inline Basemenu *getPlacementmenu(void) { return placementmenu; } 90 inline Basemenu *getTabmenu() { return tabmenu; }
93 inline Basemenu *getTabmenu(void) { return tabmenu; } 91
94 92 inline const Basemenu *getFocusmenu() const { return focusmenu; }
95 void reconfigure(void); 93 inline const Basemenu *getPlacementmenu() const { return placementmenu; }
94 inline const Basemenu *getTabmenu() const { return tabmenu; }
95
96 void reconfigure();
96}; 97};
97 98
98 99