From a2dad982f8102a57b11f4c61db986eac08de3390 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 13 May 2022 18:15:04 +0200 Subject: [PATCH] Move sqlrow to core --- src/CMakeLists.txt | 2 +- src/collection/collectionbackend.cpp | 2 +- src/collection/collectionmodel.cpp | 2 +- src/collection/collectionmodel.h | 2 +- src/core/song.cpp | 2 +- src/core/songloader.cpp | 2 +- src/{collection => core}/sqlrow.cpp | 0 src/{collection => core}/sqlrow.h | 0 src/covermanager/albumcovermanager.cpp | 2 +- src/internet/internetplaylistitem.cpp | 2 +- src/internet/internetplaylistitem.h | 2 +- src/playlist/playlistbackend.cpp | 2 +- src/playlist/playlistbackend.h | 2 +- src/playlist/songplaylistitem.cpp | 2 +- src/playlist/songplaylistitem.h | 2 +- src/radios/radioplaylistitem.cpp | 2 +- src/radios/radioplaylistitem.h | 2 +- tests/src/mock_playlistitem.h | 2 +- 18 files changed, 16 insertions(+), 16 deletions(-) rename src/{collection => core}/sqlrow.cpp (100%) rename src/{collection => core}/sqlrow.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f5cbfa9..e24593a5 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 54c50f57..b2629ef5 100644 --- a/src/collection/collectionbackend.cpp +++ b/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" diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index 4622879a..808d9bc9 100644 --- a/src/collection/collectionmodel.cpp +++ b/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" diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 94483791..22acaa14 100644 --- a/src/collection/collectionmodel.h +++ b/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; diff --git a/src/core/song.cpp b/src/core/song.cpp index 2962b42c..9c069f31 100644 --- a/src/core/song.cpp +++ b/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" diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index 522b1d04..292d2bd8 100644 --- a/src/core/songloader.cpp +++ b/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" diff --git a/src/collection/sqlrow.cpp b/src/core/sqlrow.cpp similarity index 100% rename from src/collection/sqlrow.cpp rename to src/core/sqlrow.cpp diff --git a/src/collection/sqlrow.h b/src/core/sqlrow.h similarity index 100% rename from src/collection/sqlrow.h rename to src/core/sqlrow.h diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index 2d559ec7..674175f6 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/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" diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp index e1dcc4d5..63c81bc7 100644 --- a/src/internet/internetplaylistitem.cpp +++ b/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) diff --git a/src/internet/internetplaylistitem.h b/src/internet/internetplaylistitem.h index 9625e334..a5830ff2 100644 --- a/src/internet/internetplaylistitem.h +++ b/src/internet/internetplaylistitem.h @@ -28,7 +28,7 @@ #include #include "core/song.h" -#include "collection/sqlrow.h" +#include "core/sqlrow.h" #include "playlist/playlistitem.h" class InternetService; diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index e74650ca..e13e022a 100644 --- a/src/playlist/playlistbackend.cpp +++ b/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" diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index a9844e83..0e0b3934 100644 --- a/src/playlist/playlistbackend.h +++ b/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" diff --git a/src/playlist/songplaylistitem.cpp b/src/playlist/songplaylistitem.cpp index 6d32cba5..43194912 100644 --- a/src/playlist/songplaylistitem.cpp +++ b/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" diff --git a/src/playlist/songplaylistitem.h b/src/playlist/songplaylistitem.h index 5f30dd81..9af81bf0 100644 --- a/src/playlist/songplaylistitem.h +++ b/src/playlist/songplaylistitem.h @@ -27,7 +27,7 @@ #include #include "core/song.h" -#include "collection/sqlrow.h" +#include "core/sqlrow.h" #include "playlistitem.h" class SongPlaylistItem : public PlaylistItem { diff --git a/src/radios/radioplaylistitem.cpp b/src/radios/radioplaylistitem.cpp index 6dfe9561..009631f5 100644 --- a/src/radios/radioplaylistitem.cpp +++ b/src/radios/radioplaylistitem.cpp @@ -27,7 +27,7 @@ #include #include "radioplaylistitem.h" -#include "collection/sqlrow.h" +#include "core/sqlrow.h" RadioPlaylistItem::RadioPlaylistItem(const Song::Source source) : PlaylistItem(source), source_(source) {} diff --git a/src/radios/radioplaylistitem.h b/src/radios/radioplaylistitem.h index 8a973127..87a9d379 100644 --- a/src/radios/radioplaylistitem.h +++ b/src/radios/radioplaylistitem.h @@ -26,7 +26,7 @@ #include #include "core/song.h" -#include "collection/sqlrow.h" +#include "core/sqlrow.h" #include "playlist/playlistitem.h" class RadioService; diff --git a/tests/src/mock_playlistitem.h b/tests/src/mock_playlistitem.h index 566d85b1..5f1ead6b 100644 --- a/tests/src/mock_playlistitem.h +++ b/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