Include self header first to catch problems

src/database/DatabaseHandler.cpp

@@ -17,6 +17,8 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "DatabaseHandler.hpp"
+
 #include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
@@ -39,8 +41,6 @@
 #include "Release.hpp"
 #include "Track.hpp"
 
-#include "DatabaseHandler.hpp"
-
 namespace Database {
 
 

src/database/DbArtist.cpp

@@ -16,13 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "SqlQuery.hpp"
+#include "DbArtist.hpp"
 
 #include "utils/Logger.hpp"
 
 #include "Release.hpp"
-#include "DbArtist.hpp"
+#include "SqlQuery.hpp"
 #include "Track.hpp"
 
 namespace Database

src/database/MediaDirectory.cpp

@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/Utils.hpp"
-
 #include "MediaDirectory.hpp"
 
+#include "utils/Utils.hpp"
+
 namespace Database {
 
 MediaDirectory::MediaDirectory(boost::filesystem::path p)

src/database/Playlist.cpp

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "Playlist.hpp"
+
 #include <cassert>
 
 #include "User.hpp"
 #include "Track.hpp"
 
-#include "Playlist.hpp"
-
 namespace Database {
 
 Playlist::Playlist()

src/database/Release.cpp

@@ -17,13 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SqlQuery.hpp"
+#include "Release.hpp"
 
 #include "DbArtist.hpp"
+#include "SqlQuery.hpp"
 #include "Track.hpp"
 
-#include "Release.hpp"
-
 namespace Database
 {
 

src/database/SqlQuery.cpp

@@ -17,15 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <algorithm>
+#include "SqlQuery.hpp"
 
-#include <boost/foreach.hpp>
+#include <algorithm>
 
 #include <sstream>
 #include <stdexcept>
 
-#include "SqlQuery.hpp"
-
 WhereClause&
 WhereClause::And(const WhereClause& otherClause)
 {
@@ -35,7 +33,8 @@ WhereClause::And(const WhereClause& otherClause)
 		_clause += "(" + otherClause._clause + ")";
 
 		// Add associated bind args
-		BOOST_FOREACH(const std::string& otherBindArg, otherClause._bindArgs) {
+		for (const std::string& otherBindArg : otherClause._bindArgs)
+		{
 			_bindArgs.push_back(otherBindArg);
 		}
 	}
@@ -51,7 +50,8 @@ WhereClause::Or(const WhereClause& otherClause)
 		_clause += "(" + otherClause._clause + ")";
 
 		// Add associated bind args
-		BOOST_FOREACH(const std::string& otherBindArg, otherClause._bindArgs) {
+		for (const std::string& otherBindArg : otherClause._bindArgs)
+		{
 			_bindArgs.push_back(otherBindArg);
 		}
 	}
@@ -147,7 +147,8 @@ FromClause::FromClause(const std::string& clause)
 FromClause&
 FromClause::And(const FromClause& clause)
 {
-	BOOST_FOREACH(const std::string fromClause, clause._clause) {
+	for (const std::string fromClause : clause._clause)
+	{
 		_clause.push_back(fromClause);
 	}
 

src/database/Track.cpp

@@ -17,14 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/Logger.hpp"
+#include "Track.hpp"
 
-#include "SqlQuery.hpp"
+#include "utils/Logger.hpp"
 
 #include "DbArtist.hpp"
 #include "Release.hpp"
-
-#include "Track.hpp"
+#include "SqlQuery.hpp"
 
 namespace Database {