Cleaning of include dependencies

src/Database.cpp

@@ -12,9 +12,11 @@
 
 #include "Statement.h"
 
+
 namespace SQLite
 {
 
+
 // Open the provided database UTF-8 filename with SQLITE_OPEN_xxx provided flags.
 Database::Database(const char* apFilename, const int aFlags /*= SQLITE_OPEN_READONLY*/) : // throw(SQLite::Exception)
     mpSQLite(NULL),
@@ -80,4 +82,5 @@ void Database::check(const int aRet) const // throw(SQLite::Exception)
     }
 }
 
+
 }  // namespace SQLite

src/Database.h

@@ -11,12 +11,14 @@
 #pragma once
 
 #include <sqlite3.h>
-#include "Exception.h"
+
 #include "Column.h"
 
+
 namespace SQLite
 {
 
+
 /**
  * @brief RAII management of a SQLite Database Connection.
  *

src/Exception.h

@@ -33,6 +33,7 @@
 namespace SQLite
 {
 
+
 /**
  * @brief Encapsulation of the error message from SQLite3, based on std::runtime_error.
  */

src/SQLiteC++.h

@@ -1,44 +1,41 @@
-/**
+/**
- * @file    SQLiteC++.h
+ * @file    SQLiteC++.h
- * @ingroup SQLiteCpp
+ * @ingroup SQLiteCpp
- * @brief   SQLiteC++ is a smart and simple C++ SQLite3 wrapper. This file is only "easy include" for other files.
+ * @brief   SQLiteC++ is a smart and simple C++ SQLite3 wrapper. This file is only "easy include" for other files.
- *
+ *
- * Include this main header file in your project to gain access to all functionality provided by the wrapper.
+ * Include this main header file in your project to gain access to all functionality provided by the wrapper.
- *
+ *
- * Copyright (c) 2012-2013 Sebastien Rombauts (sebastien.rombauts@gmail.com)
+ * Copyright (c) 2012-2013 Sebastien Rombauts (sebastien.rombauts@gmail.com)
- *
+ *
- * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
+ * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
- * or copy at http://opensource.org/licenses/MIT)
+ * or copy at http://opensource.org/licenses/MIT)
- */
+ */
-/**
+/**
- * @defgroup SQLiteCpp SQLiteC++
+ * @defgroup SQLiteCpp SQLiteC++
- * @brief    SQLiteC++ is a smart and simple C++ SQLite3 wrapper. This file is only "easy include" for other files.
+ * @brief    SQLiteC++ is a smart and simple C++ SQLite3 wrapper. This file is only "easy include" for other files.
- */
+ */
-#pragma once
+#pragma once
-
+
-
+
-// SQLiteC++.h requires sqlite3, and the corresponding library header
+// Include useful headers of SQLiteC++
-#include <sqlite3.h>
+#include "Exception.h"
-
+#include "Database.h"
-// Include useful headers of SQLiteC++
+#include "Statement.h"
-#include "Exception.h"
+#include "Column.h"
-#include "Database.h"
+#include "Transaction.h"
-#include "Statement.h"
+
-#include "Column.h"
+
-#include "Transaction.h"
+/**
-
+ * @brief Version numbers for SQLiteC++ are provided in the same way as sqlite3.h
-
+ *
-/**
+ * The [SQLITECPP_VERSION] C preprocessor macro in the SQLiteC++.h header
- * @brief Version numbers for SQLiteC++ are provided in the same way as sqlite3.h
+ * evaluates to a string literal that is the SQLite version in the
- *
+ * format "X.Y.Z" where X is the major version number
- * The [SQLITECPP_VERSION] C preprocessor macro in the SQLiteC++.h header
+ * and Y is the minor version number and Z is the release number.
- * evaluates to a string literal that is the SQLite version in the
+ *
- * format "X.Y.Z" where X is the major version number
+ * The [SQLITECPP_VERSION_NUMBER] C preprocessor macro resolves to an integer
- * and Y is the minor version number and Z is the release number.
+ * with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
- *
+ * numbers used in [SQLITECPP_VERSION].
- * The [SQLITECPP_VERSION_NUMBER] C preprocessor macro resolves to an integer
+ */
- * with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
+#define SQLITECPP_VERSION           "0.5.0"
- * numbers used in [SQLITECPP_VERSION].
+#define SQLITECPP_VERSION_NUMBER    0005000
- */
-#define SQLITECPP_VERSION           "0.5.0"
-#define SQLITECPP_VERSION_NUMBER    0005000

src/Statement.h

@@ -11,11 +11,13 @@
 #pragma once
 
 #include <sqlite3.h>
-#include "Exception.h"
+#include <string>
+
 
 namespace SQLite
 {
 
+
 // Forward declaration
 class Database;
 class Column;
@@ -310,4 +312,5 @@ private:
     bool            mbDone;         //!< true when the last executeStep() had no more row to fetch
 };
 
+
 }  // namespace SQLite

src/Transaction.cpp

@@ -12,9 +12,11 @@
 
 #include "Database.h"
 
+
 namespace SQLite
 {
 
+
 // Begins the SQLite transaction
 Transaction::Transaction(Database& aDatabase) : // throw(SQLite::Exception)
     mDatabase(aDatabase),

src/Transaction.h

@@ -10,12 +10,11 @@
  */
 #pragma once
 
-#include <sqlite3.h>
-#include "Exception.h"
 
 namespace SQLite
 {
 
+
 // Forward declaration
 class Database;