Revert "Make Lint Happy"

[dragonfireclient.git] / src / gui / guiTable.h

diff --git a/src/gui/guiTable.h b/src/gui/guiTable.h
index 95cf059227a6d31310381e7992ecc59611a587c0..11093ea723c697855f4adb3e2150212f1275d239 100644 (file)
--- a/src/gui/guiTable.h
+++ b/src/gui/guiTable.h
@@ -67,9 +67,9 @@ class GUITable : public gui::IGUIElement
                std::string value;
 
                Option(const std::string &name_, const std::string &value_) :
-                               name(name_), value(value_)
-               {
-               }
+                       name(name_),
+                       value(value_)
+               {}
        };
 
        /*
@@ -87,8 +87,11 @@ class GUITable : public gui::IGUIElement
        };
        typedef std::vector<TableColumn> TableColumns;
 
-       GUITable(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
-                       core::rect<s32> rectangle, ISimpleTextureSource *tsrc);
+
+       GUITable(gui::IGUIEnvironment *env,
+                       gui::IGUIElement *parent, s32 id,
+                       core::rect<s32> rectangle,
+                       ISimpleTextureSource *tsrc);
 
        virtual ~GUITable();
 
@@ -96,11 +99,13 @@ class GUITable : public gui::IGUIElement
        static Option splitOption(const std::string &str);
 
        /* Set textlist-like options, columns and data */
-       void setTextList(const std::vector<std::string> &content, bool transparent);
+       void setTextList(const std::vector<std::string> &content,
+                       bool transparent);
 
        /* Set generic table options, columns and content */
        // Adds empty strings to end of content if there is an incomplete row
-       void setTable(const TableOptions &options, const TableColumns &columns,
+       void setTable(const TableOptions &options,
+                       const TableColumns &columns,
                        std::vector<std::string> &content);
 
        /* Clear the table */
@@ -125,7 +130,7 @@ class GUITable : public gui::IGUIElement
        void setDynamicData(const DynamicData &dyndata);
 
        /* Returns "GUITable" */
-       virtual const c8 *getTypeName() const;
+       virtual const c8* getTypeName() const;
 
        /* Must be called when position or size changes */
        virtual void updateAbsolutePosition();
@@ -137,8 +142,7 @@ class GUITable : public gui::IGUIElement
        virtual bool OnEvent(const SEvent &event);
 
 protected:
-       enum ColumnType
-       {
+       enum ColumnType {
                COLUMN_TYPE_TEXT,
                COLUMN_TYPE_IMAGE,
                COLUMN_TYPE_COLOR,
@@ -146,8 +150,7 @@ class GUITable : public gui::IGUIElement
                COLUMN_TYPE_TREE,
        };
 
-       struct Cell
-       {
+       struct Cell {
                s32 xmin;
                s32 xmax;
                s32 xpos;
@@ -159,8 +162,7 @@ class GUITable : public gui::IGUIElement
                s32 reported_column;
        };
 
-       struct Row
-       {
+       struct Row {
                Cell *cells;
                s32 cellcount;
                s32 indent;
@@ -201,7 +203,7 @@ class GUITable : public gui::IGUIElement
 
        // Allocated strings and images
        std::vector<core::stringw> m_strings;
-       std::vector<video::ITexture *> m_images;
+       std::vector<video::ITexture*> m_images;
        std::map<std::string, s32> m_alloc_strings;
        std::map<std::string, s32> m_alloc_images;
 
@@ -250,5 +252,6 @@ class GUITable : public gui::IGUIElement
 
        // Aligns cell content in column according to alignment specification
        // align = 0: left aligned, 1: centered, 2: right aligned, 3: inline
-       static void alignContent(Cell *cell, s32 xmax, s32 content_width, s32 align);
+       static void alignContent(Cell *cell, s32 xmax, s32 content_width,
+                       s32 align);
 };