remove typedef enums and inline methods.

src/sql/SQLStatement.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 namespace hsql {
-    typedef enum {
+    enum StatementType {
         kStmtError, // unused
         kStmtSelect,
         kStmtImport,
@@ -19,7 +19,7 @@ namespace hsql {
         kStmtExport,
         kStmtRename,
         kStmtAlter
-    } StatementType;
+    };
 
     /**
      * Base struct for every SQL statement

src/sql/SelectStatement.h

@@ -6,10 +6,10 @@
 #include "Table.h"
 
 namespace hsql {
-    typedef enum {
+    enum OrderType {
         kOrderAsc,
         kOrderDesc
-    } OrderType;
+    };
 
     /**
      * Description of the order by clause within a select statement

src/sql/Table.h

@@ -11,23 +11,15 @@ namespace hsql {
     struct JoinDefinition;
     struct TableRef;
 
-
+    // Possible table reference types.
-    /**
+    enum TableRefType {
-     * @enum TableRefType
-     * Types table references
-     */
-    typedef enum {
         kTableName,
         kTableSelect,
         kTableJoin,
         kTableCrossProduct
-    } TableRefType;
+    };
 
-
+    // Holds reference to tables. Can be either table names or a select statement.
-    /**
-     * @struct TableRef
-     * @brief Holds reference to tables. Can be either table names or a select statement.
-     */
     struct TableRef {
         TableRef(TableRefType type);
         virtual ~TableRef();
@@ -42,37 +34,22 @@ namespace hsql {
         std::vector<TableRef*>* list;
         JoinDefinition* join;
 
+        // Returns true if a schema is set.
+        bool hasSchema();
 
-        /**
+        // Returns the alias, if it is set. Otherwise the name.
-         * Convenience accessor methods
+        char* getName();
-         */
-        inline bool hasSchema() {
-            return schema != NULL;
-        }
-
-        inline char* getName() {
-            if (alias != NULL) return alias;
-            else return name;
-        }
     };
 
-
+    // Possible types of joins.
-    /**
+    enum JoinType {
-     * @enum JoinType
-     * Types of joins
-     */
-    typedef enum {
         kJoinInner,
         kJoinOuter,
         kJoinLeft,
         kJoinRight,
-    } JoinType;
+    };
 
-
+    // Definition of a join construct.
-    /**
-     * @struct JoinDefinition
-     * @brief Definition of a join table
-     */
     struct JoinDefinition {
         JoinDefinition();
         virtual ~JoinDefinition();
@@ -84,7 +61,5 @@ namespace hsql {
         JoinType type;
     };
 
-
-
 } // namespace hsql
 #endif

src/sql/statements.cpp

@@ -180,9 +180,6 @@ namespace hsql {
         delete where;
     }
 
-
-
-
     // TableRef
     TableRef::TableRef(TableRefType type) :
         type(type),
@@ -200,6 +197,15 @@ namespace hsql {
         delete list;
     }
 
+    bool TableRef::hasSchema() {
+        return schema != NULL;
+    }
+
+    char* TableRef::getName() {
+        if (alias != NULL) return alias;
+        else return name;
+    }
+
     // JoinDefinition
     JoinDefinition::JoinDefinition() :
         left(NULL),
@@ -213,6 +219,4 @@ namespace hsql {
         delete condition;
     }
 
-
+} // namespace hsql
-
-} // namespace hsql