Adding namespace Database

database/Artist.cpp

@@ -1,5 +1,7 @@
 #include "AudioTypes.hpp"
 
+namespace Database
+{
 
 Artist::Artist(const std::string& name)
 : _name(name)
@@ -35,3 +37,6 @@ Artist::getAll(Wt::Dbo::Session& session, int offset, int size)
 {
 	return session.find<Artist>().offset(offset).limit(size);
 }
+
+} // namespace Database
+

database/AudioTypes.hpp

@@ -11,12 +11,12 @@
 
 #include <Wt/WDateTime>
 
+namespace Database {
+
 class Track;
 class Release;
 class Artist;
 
-
-
 class Artist
 {
 	public:
@@ -215,7 +215,7 @@ class Track
 		Wt::Dbo::collection< Genre::pointer > _genres;	// Tracks in the release
 };
 
-
+} // namespace database
 
 #endif
 

database/Database.cpp

@@ -10,6 +10,8 @@
 
 #include "transcode/InputMediaFile.hpp"
 
+namespace Database {
+
 Database::Database(boost::filesystem::path dbPath, MetaData::Parser& parser)
  : _db(dbPath),
    _metadataParser(parser)
@@ -428,3 +430,4 @@ Database::processVideoFile( const boost::filesystem::path& file)
 	}
 }
 
+} // namespace Database

database/Database.hpp

@@ -5,6 +5,8 @@
 
 #include "FileTypes.hpp"
 
+namespace Database {
+
 class WatchedDirectory {
 
 	public:
@@ -64,3 +66,4 @@ class Database
 		MetaData::Parser&		_metadataParser;
 };
 
+} // Database

database/DatabaseHandler.cpp

@@ -10,13 +10,13 @@ _path(db),
 _dbBackend( db.string() )
 {
 	_session.setConnection(_dbBackend);
-	_session.mapClass<Genre>("genre");
-	_session.mapClass<Track>("track");
-	_session.mapClass<Artist>("artist");
-	_session.mapClass<Release>("release");
-	_session.mapClass<Release>("release");
-	_session.mapClass<Path>("path");
-	_session.mapClass<Video>("video");
+	_session.mapClass<Database::Genre>("genre");
+	_session.mapClass<Database::Track>("track");
+	_session.mapClass<Database::Artist>("artist");
+	_session.mapClass<Database::Release>("release");
+	_session.mapClass<Database::Release>("release");
+	_session.mapClass<Database::Path>("path");
+	_session.mapClass<Database::Video>("video");
 
 	try {
 	        _session.createTables();

database/FileTypes.hpp

@@ -12,6 +12,8 @@
 
 #include "VideoTypes.hpp"
 
+namespace Database {
+
 class Path
 {
 	public:
@@ -71,6 +73,7 @@ class Path
 
 };
 
+} // namespace Database
 
 #endif
 

database/Genre.cpp

@@ -1,5 +1,6 @@
 #include "AudioTypes.hpp"
 
+namespace Database {
 
 Genre::Genre()
 {
@@ -44,3 +45,5 @@ Genre::getAll(Wt::Dbo::Session& session, std::size_t offset, std::size_t size)
 {
 	return session.find<Genre>().offset(offset).limit(size);
 }
+
+} // namespace Database

database/Path.cpp

@@ -1,10 +1,11 @@
 
 #include "FileTypes.hpp"
 
+namespace Database {
+
 Path::Path()
 {}
 
-
 Path::Path(boost::filesystem::path p)
 : _filePath (p.string()),
  _isDirectory( boost::filesystem::is_directory( _filePath ) )
@@ -100,3 +101,5 @@ Path::getFileName(void) const
 	else
 		return boost::filesystem::path(_filePath).filename().string();
 }
+
+} // namespace Database

database/Release.cpp

@@ -4,6 +4,8 @@
 
 #include "AudioTypes.hpp"
 
+namespace Database {
+
 Release::Release(const std::string& name)
 : _name(name)
 {
@@ -72,3 +74,4 @@ Release::getDuration(void) const
 }
 
 
+} // namespace Database

database/Track.cpp

@@ -4,6 +4,7 @@
 
 #include "AudioTypes.hpp"
 
+namespace Database {
 
 Track::Track(const boost::filesystem::path& p, Artist::pointer artist, Release::pointer release)
 :
@@ -127,7 +128,7 @@ Track::getAll(Wt::Dbo::Session& session,
 	return query;
 }
 
-
+} // namespace Database
 
 
 

database/Video.cpp

@@ -2,6 +2,8 @@
 
 #include "FileTypes.hpp"
 
+namespace Database {
+
 Video::Video()
 {
 }
@@ -16,3 +18,5 @@ Video::create(Wt::Dbo::Session& session, Wt::Dbo::ptr<Path> path)
 {
 	return session.add(new Video(path));
 }
+
+} // namespace Video

database/VideoTypes.hpp

@@ -10,6 +10,8 @@
 
 #include <Wt/WDateTime>
 
+namespace Database {
+
 class Path;
 
 class Video
@@ -54,6 +56,7 @@ class Video
 }; // Video
 
 
+} // namespace Database
 
 #endif