Placed db object related files in a subdirectory

src/libs/database/impl/Db.cpp

@@ -27,7 +27,7 @@
 #include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 

src/libs/database/impl/Migration.cpp

@@ -24,9 +24,9 @@
 #include "core/Exception.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Utils.hpp"

src/libs/database/impl/Session.cpp

@@ -21,35 +21,35 @@
 
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Artwork.hpp"
-#include "database/AuthToken.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
-#include "database/Listen.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/PlayQueue.hpp"
-#include "database/RatedArtist.hpp"
-#include "database/RatedRelease.hpp"
-#include "database/RatedTrack.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/UIState.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/AuthToken.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/PlayQueue.hpp"
+#include "database/objects/RatedArtist.hpp"
+#include "database/objects/RatedRelease.hpp"
+#include "database/objects/RatedTrack.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/UIState.hpp"
+#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Migration.hpp"

src/libs/database/impl/objects/Artist.cpp

@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/Artist.hpp"
+#include "database/objects/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/ArtistInfo.cpp

@@ -17,14 +17,14 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ArtistInfo.hpp"
+#include "database/objects/ArtistInfo.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/ArtistInfoId.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfoId.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Artwork.cpp

@@ -17,13 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Artwork.hpp"
-
+#include "database/objects/Artwork.hpp"
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Image.hpp"
 #include "database/Session.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/AuthToken.cpp

@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/AuthToken.hpp"
+#include "database/objects/AuthToken.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Cluster.cpp

@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/Directory.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
 #include "database/Types.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Image.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Image.hpp"
+#include "database/objects/Image.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Listen.cpp

@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Listen.hpp"
+#include "database/objects/Listen.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/MediaLibrary.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/MediaLibrary.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/PlayListFile.cpp

@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/PlayListFile.hpp"
+#include "database/objects/PlayListFile.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/PlayQueue.cpp

@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/PlayQueue.hpp"
+#include "database/objects/PlayQueue.hpp"
 
 #include <Wt/Dbo/SqlTraits.h>
 
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/RatedArtist.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedArtist.hpp"
+#include "database/objects/RatedArtist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/RatedRelease.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedRelease.hpp"
+#include "database/objects/RatedRelease.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/RatedTrack.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedTrack.hpp"
+#include "database/objects/RatedTrack.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Release.cpp

@@ -17,19 +17,19 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/PartialDateTime.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/ScanSettings.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ScanSettings.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/String.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/StarredArtist.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredArtist.hpp"
+#include "database/objects/StarredArtist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/StarredRelease.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredRelease.hpp"
+#include "database/objects/StarredRelease.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/StarredTrack.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/StarredTrack.hpp"
+#include "database/objects/StarredTrack.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/Track.cpp

@@ -17,24 +17,24 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/TrackArtistLink.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
-#include "database/Artist.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/TrackBookmark.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackBookmark.hpp"
+#include "database/objects/TrackBookmark.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/TrackEmbeddedImage.cpp

@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp

@@ -17,12 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/TrackFeatures.cpp

@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackFeatures.hpp"
+#include "database/objects/TrackFeatures.hpp"
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/TrackList.cpp

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/TrackList.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include <cassert>
 
-#include "database/Cluster.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/objects/TrackLyrics.cpp

@@ -17,16 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackLyrics.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include <Wt/Dbo/SqlTraits.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/UIState.cpp

@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/UIState.hpp"
+#include "database/objects/UIState.hpp"
 
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"

src/libs/database/impl/objects/User.cpp

@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 
 #include <cassert>
 
-#include "database/Artist.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/UIState.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/UIState.hpp"
 
 #include "Utils.hpp"
 #include "traits/EnumSetTraits.hpp"