Move sqlrow to core

src/CMakeLists.txt

@@ -12,6 +12,7 @@ set(SOURCES
   core/commandlineoptions.cpp
   core/database.cpp
   core/sqlquery.cpp
+  core/sqlrow.cpp
   core/metatypes.cpp
   core/deletefiles.cpp
   core/filesystemmusicstorage.cpp
@@ -73,7 +74,6 @@ set(SOURCES
   collection/collectionfilterwidget.cpp
   collection/collectionplaylistitem.cpp
   collection/collectionquery.cpp
-  collection/sqlrow.cpp
   collection/savedgroupingmanager.cpp
   collection/groupbydialog.cpp
   collection/collectiontask.cpp

src/collection/collectionbackend.cpp

@@ -47,10 +47,10 @@
 #include "core/database.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
+#include "core/sqlrow.h"
 #include "smartplaylists/smartplaylistsearch.h"
 
 #include "directory.h"
-#include "sqlrow.h"
 #include "collectionbackend.h"
 #include "collectionquery.h"
 #include "collectiontask.h"

src/collection/collectionmodel.cpp

@@ -59,12 +59,12 @@
 #include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/taskmanager.h"
+#include "core/sqlrow.h"
 #include "collectionquery.h"
 #include "collectionbackend.h"
 #include "collectiondirectorymodel.h"
 #include "collectionitem.h"
 #include "collectionmodel.h"
-#include "sqlrow.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
 #include "covermanager/albumcoverloader.h"

src/collection/collectionmodel.h

@@ -45,10 +45,10 @@
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"
+#include "core/sqlrow.h"
 #include "covermanager/albumcoverloader.h"
 #include "collectionquery.h"
 #include "collectionitem.h"
-#include "sqlrow.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
 class QSettings;

src/core/song.cpp

@@ -62,7 +62,7 @@
 #include "application.h"
 #include "sqlquery.h"
 #include "mpris_common.h"
-#include "collection/sqlrow.h"
+#include "sqlrow.h"
 #include "tagreadermessages.pb.h"
 
 const QStringList Song::kColumns = QStringList() << "title"

src/core/songloader.cpp

@@ -53,11 +53,11 @@
 #include "songloader.h"
 #include "tagreaderclient.h"
 #include "database.h"
+#include "sqlrow.h"
 #include "engine/enginetype.h"
 #include "engine/enginebase.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionquery.h"
-#include "collection/sqlrow.h"
 #include "playlistparsers/cueparser.h"
 #include "playlistparsers/parserbase.h"
 #include "playlistparsers/playlistparser.h"

src/covermanager/albumcovermanager.cpp

@@ -71,9 +71,9 @@
 #include "core/imageutils.h"
 #include "core/tagreaderclient.h"
 #include "core/database.h"
+#include "core/sqlrow.h"
 #include "widgets/forcescrollperpixel.h"
 #include "widgets/qsearchfield.h"
-#include "collection/sqlrow.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionquery.h"
 #include "playlist/songmimedata.h"

src/internet/internetplaylistitem.cpp

@@ -32,7 +32,7 @@
 #include "internetservices.h"
 #include "internetservice.h"
 #include "core/settingsprovider.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlist/playlistbackend.h"
 
 InternetPlaylistItem::InternetPlaylistItem(const Song::Source source)

src/internet/internetplaylistitem.h

@@ -28,7 +28,7 @@
 #include <QUrl>
 
 #include "core/song.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 class InternetService;

src/playlist/playlistbackend.cpp

@@ -48,8 +48,8 @@
 #include "core/logging.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
+#include "core/sqlrow.h"
 #include "collection/collectionbackend.h"
-#include "collection/sqlrow.h"
 #include "playlistitem.h"
 #include "songplaylistitem.h"
 #include "playlistbackend.h"

src/playlist/playlistbackend.h

@@ -36,7 +36,7 @@
 
 #include "core/song.h"
 #include "core/sqlquery.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlistitem.h"
 #include "smartplaylists/playlistgenerator.h"
 

src/playlist/songplaylistitem.cpp

@@ -25,7 +25,7 @@
 
 #include "core/tagreaderclient.h"
 #include "core/song.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlistitem.h"
 #include "songplaylistitem.h"
 

src/playlist/songplaylistitem.h

@@ -27,7 +27,7 @@
 #include <QUrl>
 
 #include "core/song.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlistitem.h"
 
 class SongPlaylistItem : public PlaylistItem {

src/radios/radioplaylistitem.cpp

@@ -27,7 +27,7 @@
 #include <QUrl>
 
 #include "radioplaylistitem.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 
 RadioPlaylistItem::RadioPlaylistItem(const Song::Source source)
     : PlaylistItem(source), source_(source) {}

src/radios/radioplaylistitem.h

@@ -26,7 +26,7 @@
 #include <QUrl>
 
 #include "core/song.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 class RadioService;

tests/src/mock_playlistitem.h

@@ -28,7 +28,7 @@
 
 #include "core/song.h"
 #include "core/settingsprovider.h"
-#include "collection/sqlrow.h"
+#include "core/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 // clazy:excludeall=returning-void-expression,function-args-by-value