Indenting from tabs to emacs 4-space

1 files changed, 92 insertions, 92 deletions

diff --git a/src/Theme.hh b/src/Theme.hh
index 19c709e..2eae595 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.20 2002/11/30 20:57:35 fluxgen Exp $
+// $Id: Theme.hh,v 1.21 2002/12/01 13:42:00 rathnor Exp $
 
 #ifndef THEME_HH
 #define THEME_HH
@@ -44,113 +44,113 @@
 class Theme {
 public: 
                 
-        Theme(Display *display, Window rootwindow, Colormap colormap, 
-                int screennum, const char *filename, const char *rootcommand);
-        ~Theme();       
+    Theme(Display *display, Window rootwindow, Colormap colormap, 
+          int screennum, const char *filename, const char *rootcommand);
+    ~Theme();   
         
         
-        typedef struct MenuStyle {
-                MenuStyle():titlefont("fixed"),
-                        framefont("fixed") { }
-                FbTk::Color t_text, f_text, h_text, d_text;
-                FbTk::Texture title, frame, hilite;
-                GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
-                FbTk::Font titlefont, framefont;
-                DrawUtil::Font::FontJustify framefont_justify;
-                DrawUtil::Font::FontJustify titlefont_justify;
-                int bullet, bullet_pos;
-        } MenuStyle;
+    typedef struct MenuStyle {
+        MenuStyle():titlefont("fixed"),
+                    framefont("fixed") { }
+        FbTk::Color t_text, f_text, h_text, d_text;
+        FbTk::Texture title, frame, hilite;
+        GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
+        FbTk::Font titlefont, framefont;
+        DrawUtil::Font::FontJustify framefont_justify;
+        DrawUtil::Font::FontJustify titlefont_justify;
+        int bullet, bullet_pos;
+    } MenuStyle;
         
-        typedef struct LabelStyle {
-                LabelStyle(const char *fontname="fixed"):font(fontname) { }
+    typedef struct LabelStyle {
+        LabelStyle(const char *fontname="fixed"):font(fontname) { }
 
-                FbTk::Texture l_focus, l_unfocus,
-                        t_focus, t_unfocus;     
-                GC l_text_focus_gc, l_text_unfocus_gc;
-                FbTk::Font font;
-                DrawUtil::Font::FontJustify justify;
-                FbTk::Color l_text_focus, l_text_unfocus;
-        } LabelStyle;
+        FbTk::Texture l_focus, l_unfocus,
+            t_focus, t_unfocus; 
+        GC l_text_focus_gc, l_text_unfocus_gc;
+        FbTk::Font font;
+        DrawUtil::Font::FontJustify justify;
+        FbTk::Color l_text_focus, l_text_unfocus;
+    } LabelStyle;
 
         
-        typedef struct WindowStyle:public LabelStyle {
-                FbTk::Color f_focus, f_unfocus, b_pic_focus,
-                        b_pic_unfocus;
-                FbTk::Texture h_focus, h_unfocus,
-                        b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
-                GC b_pic_focus_gc, b_pic_unfocus_gc;
-
-                struct t_tab:public LabelStyle {
-                        FbTk::Color border_color;
-                        unsigned int border_width;
-                        unsigned int border_width_2x;
-                } tab;
+    typedef struct WindowStyle:public LabelStyle {
+        FbTk::Color f_focus, f_unfocus, b_pic_focus,
+            b_pic_unfocus;
+        FbTk::Texture h_focus, h_unfocus,
+            b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
+        GC b_pic_focus_gc, b_pic_unfocus_gc;
+
+        struct t_tab:public LabelStyle {
+            FbTk::Color border_color;
+            unsigned int border_width;
+            unsigned int border_width_2x;
+        } tab;
         
-        } WindowStyle;
+    } WindowStyle;
 
         
-        typedef struct ToolbarStyle {
-                ToolbarStyle():font("fixed") { } // default font 'fixed'
-                FbTk::Color l_text, w_text, c_text, b_pic;
-                FbTk::Texture toolbar, label, window, button, pressed, clock;
-                GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
-                FbTk::Font font;
-                DrawUtil::Font::FontJustify justify;
-        } ToolbarStyle; 
+    typedef struct ToolbarStyle {
+        ToolbarStyle():font("fixed") { } // default font 'fixed'
+        FbTk::Color l_text, w_text, c_text, b_pic;
+        FbTk::Texture toolbar, label, window, button, pressed, clock;
+        GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
+        FbTk::Font font;
+        DrawUtil::Font::FontJustify justify;
+    } ToolbarStyle;     
                 
-        inline WindowStyle &getWindowStyle() { return m_windowstyle; }
-        inline MenuStyle &getMenuStyle() { return m_menustyle; }
-        inline ToolbarStyle &getToolbarStyle() { return m_toolbarstyle; }
-        inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; }
-        inline unsigned int getBevelWidth() const { return m_bevel_width; }
-        inline unsigned int getBorderWidth() const { return m_border_width; }
-        inline unsigned int getHandleWidth() const { return m_handle_width; }
-        inline unsigned int getFrameWidth() const { return m_frame_width; }
-        inline GC getOpGC() const { return m_opgc; }
-        inline const FbTk::Color &getBorderColor() const { return m_border_color; }
-        void load(const char *filename);
-        void reconfigure(bool antialias = false);
+    inline WindowStyle &getWindowStyle() { return m_windowstyle; }
+    inline MenuStyle &getMenuStyle() { return m_menustyle; }
+    inline ToolbarStyle &getToolbarStyle() { return m_toolbarstyle; }
+    inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; }
+    inline unsigned int getBevelWidth() const { return m_bevel_width; }
+    inline unsigned int getBorderWidth() const { return m_border_width; }
+    inline unsigned int getHandleWidth() const { return m_handle_width; }
+    inline unsigned int getFrameWidth() const { return m_frame_width; }
+    inline GC getOpGC() const { return m_opgc; }
+    inline const FbTk::Color &getBorderColor() const { return m_border_color; }
+    void load(const char *filename);
+    void reconfigure(bool antialias = false);
         
-        inline void setRootCommand(const std::string &command) { m_rootcommand = command; }
+    inline void setRootCommand(const std::string &command) { m_rootcommand = command; }
         
         
         
 private:
         
-        void loadMenuStyle();
-        void loadWindowStyle();
-        void loadTabStyle();
-        void loadToolbarStyle();        
-        void loadRootCommand();
-        void loadMisc();
-        void freeMenuStyle();
-        void freeWindowStyle();
-        void freeTabStyle();
-        void freeToolbarStyle();
-        void loadFontFromDatabase(FbTk::Font &dest, const char *name, const char *altname);
-        bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long);
-        bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long);
-
-        void readDatabaseFontSet(char *, char *, XFontSet *);
-        XFontSet createFontSet(char *);
-        void readDatabaseFont(char *, char *, XFontStruct **);
-
-        static const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...);
-        static const char *getFontSize(const char *pattern, int *size);
-
-
-        WindowStyle m_windowstyle;
-        MenuStyle m_menustyle;
-        ToolbarStyle    m_toolbarstyle;
-        unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width;
-        FbTk::Color m_border_color;
-        GC m_opgc;
-        Display *m_display;      
-        XrmDatabase m_database;
-        Colormap m_colormap;
-        int m_screennum;
-        std::string m_rootcommand;
-        FbTk::Texture m_slit_texture;
+    void loadMenuStyle();
+    void loadWindowStyle();
+    void loadTabStyle();
+    void loadToolbarStyle();    
+    void loadRootCommand();
+    void loadMisc();
+    void freeMenuStyle();
+    void freeWindowStyle();
+    void freeTabStyle();
+    void freeToolbarStyle();
+    void loadFontFromDatabase(FbTk::Font &dest, const char *name, const char *altname);
+    bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long);
+    bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long);
+
+    void readDatabaseFontSet(char *, char *, XFontSet *);
+    XFontSet createFontSet(char *);
+    void readDatabaseFont(char *, char *, XFontStruct **);
+
+    static const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...);
+    static const char *getFontSize(const char *pattern, int *size);
+
+
+    WindowStyle m_windowstyle;
+    MenuStyle m_menustyle;
+    ToolbarStyle        m_toolbarstyle;
+    unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width;
+    FbTk::Color m_border_color;
+    GC m_opgc;
+    Display *m_display;  
+    XrmDatabase m_database;
+    Colormap m_colormap;
+    int m_screennum;
+    std::string m_rootcommand;
+    FbTk::Texture m_slit_texture;
 };