Placed db object related files in a subdirectory

src/libs/database/CMakeLists.txt

@@ -1,41 +1,41 @@
 add_library(lmsdatabase STATIC
-	impl/Artist.cpp
-	impl/ArtistInfo.cpp
-	impl/Artwork.cpp
-	impl/AuthToken.cpp
-	impl/Cluster.cpp
+	impl/objects/Artist.cpp
+	impl/objects/ArtistInfo.cpp
+	impl/objects/Artwork.cpp
+	impl/objects/AuthToken.cpp
+	impl/objects/Cluster.cpp
+	impl/objects/Directory.cpp
+	impl/objects/Image.cpp
+	impl/objects/Listen.cpp
+	impl/objects/MediaLibrary.cpp
+	impl/objects/PlayListFile.cpp
+	impl/objects/PlayQueue.cpp
+	impl/objects/TrackArtistLink.cpp
+	impl/objects/TrackFeatures.cpp
+	impl/objects/TrackList.cpp
+	impl/objects/RatedArtist.cpp
+	impl/objects/RatedRelease.cpp
+	impl/objects/RatedTrack.cpp
+	impl/objects/Release.cpp
+	impl/objects/ScanSettings.cpp
+	impl/objects/StarredArtist.cpp
+	impl/objects/StarredRelease.cpp
+	impl/objects/StarredTrack.cpp
+	impl/objects/Track.cpp
+	impl/objects/TrackBookmark.cpp
+	impl/objects/TrackEmbeddedImage.cpp
+	impl/objects/TrackEmbeddedImageLink.cpp
+	impl/objects/TrackLyrics.cpp
+	impl/objects/UIState.cpp
+	impl/objects/User.cpp
 	impl/Db.cpp
-	impl/Directory.cpp
 	impl/IdType.cpp
-	impl/Image.cpp
-	impl/Listen.cpp
-	impl/MediaLibrary.cpp
 	impl/Migration.cpp
 	impl/Object.cpp
-	impl/PlayListFile.cpp
-	impl/PlayQueue.cpp
-	impl/TrackArtistLink.cpp
-	impl/TrackFeatures.cpp
-	impl/TrackList.cpp
-	impl/RatedArtist.cpp
-	impl/RatedRelease.cpp
-	impl/RatedTrack.cpp
-	impl/Release.cpp
-	impl/ScanSettings.cpp
 	impl/Session.cpp
-	impl/StarredArtist.cpp
-	impl/StarredRelease.cpp
-	impl/StarredTrack.cpp
 	impl/SqlQuery.cpp
-	impl/Track.cpp
-	impl/TrackBookmark.cpp
-	impl/TrackEmbeddedImage.cpp
-	impl/TrackEmbeddedImageLink.cpp
-	impl/TrackLyrics.cpp
 	impl/Transaction.cpp
 	impl/Types.cpp
-	impl/UIState.cpp
-	impl/User.cpp
 	impl/Utils.cpp
 	)
 
@@ -48,6 +48,7 @@ target_include_directories(lmsdatabase INTERFACE
 	)
 
 target_include_directories(lmsdatabase PRIVATE
+	impl
 	include
 	)
 

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"

src/libs/database/include/database/objects/Artist.hpp

@@ -30,17 +30,17 @@
 
 #include "core/EnumSet.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/ClusterId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/ArtistInfo.hpp

@@ -27,11 +27,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
-#include "database/ArtistInfoId.hpp"
-#include "database/DirectoryId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtistInfoId.hpp"
+#include "database/objects/DirectoryId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Artwork.hpp

@@ -24,10 +24,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtworkId.hpp"
-#include "database/ImageId.hpp"
 #include "database/Object.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ImageId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/AuthToken.hpp

@@ -25,10 +25,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/AuthTokenId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/AuthTokenId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Cluster.hpp

@@ -28,11 +28,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ClusterId.hpp"
 #include "database/Object.hpp"
-#include "database/Release.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Directory.hpp

@@ -28,12 +28,12 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Filters.hpp

@@ -22,10 +22,10 @@
 #include <span>
 #include <vector>
 
-#include "database/ClusterId.hpp"
-#include "database/LabelId.hpp"
-#include "database/MediaLibraryId.hpp"
-#include "database/ReleaseTypeId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/LabelId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseTypeId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Image.hpp

@@ -25,10 +25,10 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/DirectoryId.hpp"
-#include "database/ImageId.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/ImageId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Listen.hpp

@@ -24,14 +24,14 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
-#include "database/Filters.hpp"
-#include "database/ListenId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/ListenId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/MediaLibrary.hpp

@@ -26,8 +26,8 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/PlayListFile.hpp

@@ -27,9 +27,9 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/DirectoryId.hpp"
 #include "database/IdRange.hpp"
 #include "database/Object.hpp"
+#include "database/objects/DirectoryId.hpp"
 
 LMS_DECLARE_IDTYPE(PlayListFileId)
 

src/libs/database/include/database/objects/PlayQueue.hpp

@@ -28,9 +28,9 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 LMS_DECLARE_IDTYPE(PlayQueueId)
 

src/libs/database/include/database/objects/RatedArtist.hpp

@@ -22,11 +22,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/RatedArtistId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/RatedArtistId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/RatedRelease.hpp

@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/RatedReleaseId.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/RatedReleaseId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/RatedTrack.hpp

@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/RatedTrackId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/RatedTrackId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Release.hpp

@@ -30,19 +30,19 @@
 #include "core/EnumSet.hpp"
 #include "core/PartialDateTime.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/CountryId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/LabelId.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/ReleaseTypeId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/CountryId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/LabelId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/ReleaseTypeId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/StarredArtist.hpp

@@ -22,11 +22,11 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/StarredArtistId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/StarredArtistId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/StarredRelease.hpp

@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/StarredReleaseId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/StarredReleaseId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/StarredTrack.hpp

@@ -23,10 +23,10 @@
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/StarredTrackId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/StarredTrackId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/Track.hpp

@@ -34,20 +34,20 @@
 #include "core/EnumSet.hpp"
 #include "core/PartialDateTime.hpp"
 #include "core/UUID.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/ClusterId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/Filters.hpp"
 #include "database/IdRange.hpp"
-#include "database/MediaLibraryId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/ClusterId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/TrackArtistLink.hpp

@@ -26,12 +26,12 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackArtistLinkId)
 

src/libs/database/include/database/objects/TrackBookmark.hpp

@@ -26,9 +26,9 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/UserId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackBookmarkId)
 

src/libs/database/include/database/objects/TrackEmbeddedImage.hpp

@@ -26,13 +26,13 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
 #include "database/Object.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp

@@ -25,9 +25,9 @@
 #include <Wt/Dbo/Dbo.h>
 
 #include "database/Object.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackEmbeddedImageLinkId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackEmbeddedImageLinkId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/TrackFeatures.hpp

@@ -29,8 +29,8 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackFeaturesId)
 

src/libs/database/include/database/objects/TrackList.hpp

@@ -27,12 +27,12 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Filters.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/Filters.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/TrackLyrics.hpp

@@ -29,8 +29,8 @@
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
-#include "database/TrackId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackId.hpp"
 
 LMS_DECLARE_IDTYPE(TrackLyricsId)
 

src/libs/database/include/database/objects/UIState.hpp

@@ -24,8 +24,8 @@
 #include "core/String.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UIStateId.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UIStateId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/include/database/objects/User.hpp

@@ -29,7 +29,7 @@
 #include "core/UUID.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
-#include "database/UserId.hpp"
+#include "database/objects/UserId.hpp"
 
 namespace lms::db
 {

src/libs/database/test/Artist.cpp

@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/ArtistInfo.cpp

@@ -19,9 +19,9 @@
 
 #include "Common.hpp"
 
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Directory.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Directory.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Artwork.cpp

@@ -17,10 +17,10 @@
 
 #include "Common.hpp"
 
-#include "database/Artwork.hpp"
-#include "database/Image.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/AuthToken.cpp

@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/AuthToken.hpp"
+#include "database/objects/AuthToken.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Common.cpp

@@ -19,9 +19,9 @@
 
 #include "Common.hpp"
 
-#include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/Types.hpp"
+#include "database/objects/Release.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Common.hpp

@@ -24,21 +24,21 @@
 
 #include <gtest/gtest.h>
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Listen.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Listen.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ScanSettings.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Directory.cpp

@@ -19,7 +19,7 @@
 
 #include "Common.hpp"
 
-#include "database/Directory.hpp"
+#include "database/objects/Directory.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Image.cpp

@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/Listen.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Listen.hpp"
+#include "database/objects/Listen.hpp"
 
 #include "Common.hpp"
 

src/libs/database/test/Migration.cpp

@@ -20,26 +20,26 @@
 #include "Common.hpp"
 
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/AuthToken.hpp"
-#include "database/Directory.hpp"
-#include "database/Image.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/PlayQueue.hpp"
-#include "database/RatedArtist.hpp"
-#include "database/RatedRelease.hpp"
-#include "database/RatedTrack.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/StarredArtist.hpp"
-#include "database/StarredRelease.hpp"
-#include "database/StarredTrack.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.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/AuthToken.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.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/ScanSettings.hpp"
+#include "database/objects/StarredArtist.hpp"
+#include "database/objects/StarredRelease.hpp"
+#include "database/objects/StarredTrack.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/UIState.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/PlayListFile.cpp

@@ -19,8 +19,8 @@
 
 #include "Common.hpp"
 
-#include "database/PlayListFile.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/TrackList.hpp"
 
 namespace lms::db::tests
 {

src/libs/database/test/RatedArtist.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/RatedArtist.hpp"
+#include "database/objects/RatedArtist.hpp"
 
 #include "Common.hpp"