Placed db object related files in a subdirectory

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"
 

src/libs/database/test/RatedRelease.cpp

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

src/libs/database/test/RatedTrack.cpp

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

src/libs/database/test/Release.cpp

@@ -20,8 +20,8 @@
 #include "Common.hpp"
 
 #include "core/PartialDateTime.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/ScanSettings.cpp

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

src/libs/database/test/StarredArtist.cpp

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

src/libs/database/test/StarredRelease.cpp

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

src/libs/database/test/StarredTrack.cpp

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

src/libs/database/test/Track.cpp

@@ -21,8 +21,8 @@
 
 #include <algorithm>
 
-#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/TrackArtistLink.cpp

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

src/libs/database/test/TrackBookmark.cpp

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

src/libs/database/test/TrackEmbeddedImage.cpp

@@ -19,10 +19,10 @@
 
 #include <limits>
 
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackList.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackList.hpp"
 
 #include "Common.hpp"
 

src/libs/database/test/TrackFeatures.cpp

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

src/libs/database/test/TrackLyrics.cpp

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