aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-05-22 00:36:56 (GMT)
committerfluxgen <fluxgen>2002-05-22 00:36:56 (GMT)
commitea4c11a52e05844c3ebd99a6ee5b44a04852067b (patch)
tree9f30f322e9e4569f7389afb3569405f3ff91339b
parentc502ad9356ab1fe4c0f5cbdec9c0d5c1f8134238 (diff)
downloadfluxbox-ea4c11a52e05844c3ebd99a6ee5b44a04852067b.zip
fluxbox-ea4c11a52e05844c3ebd99a6ee5b44a04852067b.tar.bz2
const fixes
-rw-r--r--src/Screen.hh61
1 files changed, 31 insertions, 30 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 27957ce..86888e3 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
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: Screen.hh,v 1.36 2002/05/19 17:56:55 fluxgen Exp $ 25// $Id: Screen.hh,v 1.37 2002/05/22 00:36:56 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -70,31 +70,31 @@ public:
70 int scrn); 70 int scrn);
71 ~BScreen(); 71 ~BScreen();
72 72
73 inline bool isToolbarOnTop(void) { return *resource.toolbar_on_top; } 73 inline bool isToolbarOnTop(void) const { return *resource.toolbar_on_top; }
74 inline bool doToolbarAutoHide(void) { return *resource.toolbar_auto_hide; } 74 inline bool doToolbarAutoHide(void) const { return *resource.toolbar_auto_hide; }
75 inline bool isSloppyFocus(void) { return resource.sloppy_focus; } 75 inline bool isSloppyFocus(void) const { return resource.sloppy_focus; }
76 inline bool isSemiSloppyFocus(void) { return resource.semi_sloppy_focus; } 76 inline bool isSemiSloppyFocus(void) const { return resource.semi_sloppy_focus; }
77 inline bool isRootColormapInstalled(void) { return root_colormap_installed; } 77 inline bool isRootColormapInstalled(void) const { return root_colormap_installed; }
78 inline bool isScreenManaged(void) { return managed; } 78 inline bool isScreenManaged(void) const { return managed; }
79 inline bool isTabRotateVertical(void) { return *resource.tab_rotate_vertical; } 79 inline bool isTabRotateVertical(void) const { return *resource.tab_rotate_vertical; }
80 inline bool isSloppyWindowGrouping(void) { return *resource.sloppy_window_grouping; } 80 inline bool isSloppyWindowGrouping(void) const { return *resource.sloppy_window_grouping; }
81 inline bool isWorkspaceWarping(void) { return *resource.workspace_warping; } 81 inline bool isWorkspaceWarping(void) const { return *resource.workspace_warping; }
82 inline bool isDesktopWheeling(void) { return *resource.desktop_wheeling; } 82 inline bool isDesktopWheeling(void) const { return *resource.desktop_wheeling; }
83 inline bool doAutoRaise(void) { return resource.auto_raise; } 83 inline bool doAutoRaise(void) const { return resource.auto_raise; }
84 inline bool doImageDither(void) { return *resource.image_dither; } 84 inline bool doImageDither(void) const { return *resource.image_dither; }
85 inline bool doMaxOverSlit(void) { return *resource.max_over_slit; } 85 inline bool doMaxOverSlit(void) const { return *resource.max_over_slit; }
86 inline bool doOpaqueMove(void) { return *resource.opaque_move; } 86 inline bool doOpaqueMove(void) const { return *resource.opaque_move; }
87 inline bool doFullMax(void) { return *resource.full_max; } 87 inline bool doFullMax(void) const { return *resource.full_max; }
88 inline bool doFocusNew(void) { return *resource.focus_new; } 88 inline bool doFocusNew(void) const { return *resource.focus_new; }
89 inline bool doFocusLast(void) { return *resource.focus_last; } 89 inline bool doFocusLast(void) const { return *resource.focus_last; }
90 inline bool doShowWindowPos(void) { return *resource.show_window_pos; } 90 inline bool doShowWindowPos(void) const { return *resource.show_window_pos; }
91 91
92 inline const GC &getOpGC() const { return theme->getOpGC(); } 92 inline const GC &getOpGC() const { return theme->getOpGC(); }
93 93
94 inline const BColor *getBorderColor(void) { return &theme->getBorderColor(); } 94 inline const BColor *getBorderColor(void) const { return &theme->getBorderColor(); }
95 inline BImageControl *getImageControl(void) { return image_control; } 95 inline BImageControl *getImageControl(void) { return image_control; }
96 inline Rootmenu *getRootmenu(void) { return rootmenu; } 96 inline Rootmenu *getRootmenu(void) { return rootmenu; }
97 inline std::string &getRootCommand(void) { return *resource.rootcommand; } 97 inline const std::string &getRootCommand(void ) const { return *resource.rootcommand; }
98#ifdef SLIT 98#ifdef SLIT
99 inline bool isSlitOnTop(void) const { return resource.slit_on_top; } 99 inline bool isSlitOnTop(void) const { return resource.slit_on_top; }
100 inline bool doSlitAutoHide(void) const { return resource.slit_auto_hide; } 100 inline bool doSlitAutoHide(void) const { return resource.slit_auto_hide; }
@@ -120,7 +120,7 @@ public:
120 inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; } 120 inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; }
121 121
122 inline unsigned int getHandleWidth(void) const { return theme->getHandleWidth(); } 122 inline unsigned int getHandleWidth(void) const { return theme->getHandleWidth(); }
123 inline unsigned int getBevelWidth(void) const { return theme->getBevelWidth(); } 123 inline unsigned int getBevelWidth(void) const { return theme->getBevelWidth(); }
124 inline unsigned int getFrameWidth(void) const { return theme->getFrameWidth(); } 124 inline unsigned int getFrameWidth(void) const { return theme->getFrameWidth(); }
125 inline unsigned int getBorderWidth(void) const { return theme->getBorderWidth(); } 125 inline unsigned int getBorderWidth(void) const { return theme->getBorderWidth(); }
126 inline unsigned int getBorderWidth2x(void) const { return theme->getBorderWidth()*2; } 126 inline unsigned int getBorderWidth2x(void) const { return theme->getBorderWidth()*2; }
@@ -129,22 +129,23 @@ public:
129 typedef std::vector<FluxboxWindow *> Icons; 129 typedef std::vector<FluxboxWindow *> Icons;
130 inline unsigned int getCount(void) const { return workspacesList.size(); } 130 inline unsigned int getCount(void) const { return workspacesList.size(); }
131 inline unsigned int getIconCount(void) const { return iconList.size(); } 131 inline unsigned int getIconCount(void) const { return iconList.size(); }
132 inline const Icons &getIconList(void) const { return iconList; }
132 inline Icons &getIconList(void) { return iconList; } 133 inline Icons &getIconList(void) { return iconList; }
133 134
134 inline int getNumberOfWorkspaces(void) { return *resource.workspaces; } 135 inline int getNumberOfWorkspaces(void) const { return *resource.workspaces; }
135 inline Toolbar::Placement getToolbarPlacement(void) { return *resource.toolbar_placement; } 136 inline Toolbar::Placement getToolbarPlacement(void) const { return *resource.toolbar_placement; }
136#ifdef XINERAMA 137#ifdef XINERAMA
137 inline int getToolbarOnHead(void) { return *resource.toolbar_on_head; } 138 inline int getToolbarOnHead(void) { return *resource.toolbar_on_head; }
138#endif // XINERAMA 139#endif // XINERAMA
139 inline int getToolbarWidthPercent(void) { return *resource.toolbar_width_percent; } 140 inline int getToolbarWidthPercent(void) const { return *resource.toolbar_width_percent; }
140 inline int getPlacementPolicy(void) const { return resource.placement_policy; } 141 inline int getPlacementPolicy(void) const { return resource.placement_policy; }
141 inline int getEdgeSnapThreshold(void) { return *resource.edge_snap_threshold; } 142 inline int getEdgeSnapThreshold(void) const { return *resource.edge_snap_threshold; }
142 inline int getRowPlacementDirection(void) const { return resource.row_direction; } 143 inline int getRowPlacementDirection(void) const { return resource.row_direction; }
143 inline int getColPlacementDirection(void) const { return resource.col_direction; } 144 inline int getColPlacementDirection(void) const { return resource.col_direction; }
144 inline unsigned int getTabWidth(void) { return *resource.tab_width; } 145 inline unsigned int getTabWidth(void) const { return *resource.tab_width; }
145 inline unsigned int getTabHeight(void) { return *resource.tab_height; } 146 inline unsigned int getTabHeight(void) const { return *resource.tab_height; }
146 inline Tab::Placement getTabPlacement(void) { return *resource.tab_placement; } 147 inline Tab::Placement getTabPlacement(void) const { return *resource.tab_placement; }
147 inline Tab::Alignment getTabAlignment(void) { return *resource.tab_alignment; } 148 inline Tab::Alignment getTabAlignment(void) const { return *resource.tab_alignment; }
148 149
149 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 150 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
150 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 151 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }