1 files changed, 56 insertions, 56 deletions

diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index d76c2fb..1e82b6d 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -1,6 +1,6 @@
 // MenuTheme.hh for FbTk
 // Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
@@ -55,90 +55,90 @@ public:
        @name text colors
     */
     ///@{
-    inline const Color &titleTextColor() const { return *t_text; }
-    inline const Color &frameTextColor() const { return *f_text; }
-    inline const Color &frameUnderlineColor() const { return *u_text; }
-    inline const Color &highlightTextColor() const { return *h_text; }
-    inline const Color &disableTextColor() const { return *d_text; }
+    const Color &titleTextColor() const { return *t_text; }
+    const Color &frameTextColor() const { return *f_text; }
+    const Color &frameUnderlineColor() const { return *u_text; }
+    const Color &highlightTextColor() const { return *h_text; }
+    const Color &disableTextColor() const { return *d_text; }
     ///@}
     /**
        @name textures
     */
     ///@{
-    inline const Texture &titleTexture() const { return *title; }
-    inline const Texture &frameTexture() const { return *frame; }
-    inline const Texture &hiliteTexture() const { return *hilite; }
+    const Texture &titleTexture() const { return *title; }
+    const Texture &frameTexture() const { return *frame; }
+    const Texture &hiliteTexture() const { return *hilite; }
     ///@}
 
-    inline const PixmapWithMask &bulletPixmap() const { return *m_bullet_pixmap; }
-    inline const PixmapWithMask &selectedPixmap() const { return *m_selected_pixmap; }
-    inline const PixmapWithMask &unselectedPixmap() const { return *m_unselected_pixmap; }
+    const PixmapWithMask &bulletPixmap() const { return *m_bullet_pixmap; }
+    const PixmapWithMask &selectedPixmap() const { return *m_selected_pixmap; }
+    const PixmapWithMask &unselectedPixmap() const { return *m_unselected_pixmap; }
 
-    inline const PixmapWithMask &highlightBulletPixmap() const { return *m_hl_bullet_pixmap; }
-    inline const PixmapWithMask &highlightSelectedPixmap() const { return *m_hl_selected_pixmap; }
-    inline const PixmapWithMask &highlightUnselectedPixmap() const { return *m_hl_unselected_pixmap; }
+    const PixmapWithMask &highlightBulletPixmap() const { return *m_hl_bullet_pixmap; }
+    const PixmapWithMask &highlightSelectedPixmap() const { return *m_hl_selected_pixmap; }
+    const PixmapWithMask &highlightUnselectedPixmap() const { return *m_hl_unselected_pixmap; }
     /**
        @name fonts
     */
     ///@{
-    inline const Font &titleFont() const { return *titlefont; }
-    inline Font &titleFont() { return *titlefont; }
-    inline const Font &frameFont() const { return *framefont; }
-    inline Font &frameFont() { return *framefont; }
+    const Font &titleFont() const { return *titlefont; }
+    Font &titleFont() { return *titlefont; }
+    const Font &frameFont() const { return *framefont; }
+    Font &frameFont() { return *framefont; }
     ///@}
 
-    inline Justify frameFontJustify() const { return *framefont_justify; }
-    inline Justify titleFontJustify() const { return *titlefont_justify; }
-        
+    Justify frameFontJustify() const { return *framefont_justify; }
+    Justify titleFontJustify() const { return *titlefont_justify; }
+
     /**
        @name graphic contexts
     */
     ///@{
-    inline const GContext &titleTextGC() const { return t_text_gc; }
-    inline const GContext &frameTextGC() const { return f_text_gc; }
-    inline const GContext &frameUnderlineGC() const { return u_text_gc; }
-    inline const GContext &hiliteTextGC() const { return h_text_gc; }
-    inline const GContext &disableTextGC() const { return d_text_gc; }
-    inline const GContext &hiliteGC() const { return hilite_gc; }
-    inline GContext &titleTextGC() { return t_text_gc; }
-    inline GContext &frameTextGC() { return f_text_gc; }
-    inline GContext &frameUnderlineGC() { return u_text_gc; }
-    inline GContext &hiliteTextGC() { return h_text_gc; }
-    inline GContext &disableTextGC() { return d_text_gc; }
-    inline GContext &hiliteGC() { return hilite_gc; }
+    const GContext &titleTextGC() const { return t_text_gc; }
+    const GContext &frameTextGC() const { return f_text_gc; }
+    const GContext &frameUnderlineGC() const { return u_text_gc; }
+    const GContext &hiliteTextGC() const { return h_text_gc; }
+    const GContext &disableTextGC() const { return d_text_gc; }
+    const GContext &hiliteGC() const { return hilite_gc; }
+    GContext &titleTextGC() { return t_text_gc; }
+    GContext &frameTextGC() { return f_text_gc; }
+    GContext &frameUnderlineGC() { return u_text_gc; }
+    GContext &hiliteTextGC() { return h_text_gc; }
+    GContext &disableTextGC() { return d_text_gc; }
+    GContext &hiliteGC() { return hilite_gc; }
     ///@}
-    inline BulletType bullet() const { return *m_bullet; }
-    inline Justify bulletPos() const { return *bullet_pos; }
+    BulletType bullet() const { return *m_bullet; }
+    Justify bulletPos() const { return *bullet_pos; }
 
-    inline unsigned int titleHeight() const { return m_real_title_height; }
-    inline unsigned int itemHeight() const { return m_real_item_height; }
-    inline unsigned int borderWidth() const { return *m_border_width; }
-    inline unsigned int bevelWidth() const { return *m_bevel_width; }
+    unsigned int titleHeight() const { return m_real_title_height; }
+    unsigned int itemHeight() const { return m_real_item_height; }
+    unsigned int borderWidth() const { return *m_border_width; }
+    unsigned int bevelWidth() const { return *m_bevel_width; }
 
-    inline unsigned char alpha() const { return m_alpha; }
-    inline void setAlpha(unsigned char alpha) { m_alpha = alpha; }
+    unsigned char alpha() const { return m_alpha; }
+    void setAlpha(unsigned char alpha) { m_alpha = alpha; }
     // this isn't actually a theme item
     // but we'll let it be here for now, until there's a better way to
     // get resources into menu
-    inline void setMenuMode(MenuMode mode) { m_menumode = mode; }
-    inline MenuMode menuMode() const { return m_menumode; }
-    inline void setDelayOpen(int msec) { m_delayopen = msec; }
-    inline void setDelayClose(int msec) { m_delayclose = msec; }
-    inline int delayOpen() const { return m_delayopen; }
-    inline int delayClose() const { return m_delayclose; }
-    
-    inline const Color &borderColor() const { return *m_border_color; }
-    inline Shape::ShapePlace shapePlaces() const { return *m_shapeplace; }
+    void setMenuMode(MenuMode mode) { m_menumode = mode; }
+    MenuMode menuMode() const { return m_menumode; }
+    void setDelayOpen(int msec) { m_delayopen = msec; }
+    void setDelayClose(int msec) { m_delayclose = msec; }
+    int delayOpen() const { return m_delayopen; }
+    int delayClose() const { return m_delayclose; }
+
+    const Color &borderColor() const { return *m_border_color; }
+    Shape::ShapePlace shapePlaces() const { return *m_shapeplace; }
 
     // special override
-    inline void setSelectedPixmap(Pixmap pm, bool is_imagecached) {
-        m_selected_pixmap->pixmap() = pm; 
+    void setSelectedPixmap(Pixmap pm, bool is_imagecached) {
+        m_selected_pixmap->pixmap() = pm;
         if (is_imagecached)
             m_selected_pixmap->pixmap().dontFree();
     }
 
-    inline void setHighlightSelectedPixmap(Pixmap pm, bool is_imagecached) {
-        m_hl_selected_pixmap->pixmap() = pm; 
+    void setHighlightSelectedPixmap(Pixmap pm, bool is_imagecached) {
+        m_hl_selected_pixmap->pixmap() = pm;
         if (is_imagecached)
             m_hl_selected_pixmap->pixmap().dontFree();
     }
@@ -148,7 +148,7 @@ private:
     ThemeItem<Texture> title, frame, hilite;
     ThemeItem<Font> titlefont, framefont;
     ThemeItem<Justify> framefont_justify, titlefont_justify;
-    ThemeItem<Justify> bullet_pos; 
+    ThemeItem<Justify> bullet_pos;
     ThemeItem<BulletType> m_bullet;
     ThemeItem<Shape::ShapePlace> m_shapeplace;
     ThemeItem<unsigned int> m_title_height, m_item_height;