From e507eafccd8757228d0307a1cda3ae488707c3b1 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 28 Oct 2019 13:35:39 +0100 Subject: [PATCH] Moved service file into utils --- src/api/subsonic/SubsonicResource.cpp | 2 +- src/av/AvTranscoder.cpp | 2 +- src/main/main.cpp | 2 +- src/similarity/features/AcousticBrainzUtils.cpp | 2 +- src/similarity/features/SimilarityFeaturesCache.cpp | 2 +- src/ui/Auth.cpp | 2 +- src/ui/LmsApplication.cpp | 2 +- src/ui/PlayQueueView.cpp | 2 +- src/ui/SettingsView.cpp | 12 ++++++------ src/ui/admin/DatabaseSettingsView.cpp | 2 +- src/ui/admin/DatabaseStatus.cpp | 2 +- src/ui/admin/InitWizardView.cpp | 2 +- src/ui/admin/UserView.cpp | 2 +- src/ui/explore/ArtistInfoView.cpp | 2 +- src/ui/explore/ReleaseInfoView.cpp | 2 +- src/ui/resource/ImageResource.cpp | 2 +- src/{main => utils}/Service.hpp | 0 17 files changed, 21 insertions(+), 21 deletions(-) rename src/{main => utils}/Service.hpp (100%) diff --git a/src/api/subsonic/SubsonicResource.cpp b/src/api/subsonic/SubsonicResource.cpp index d9ef7ddb..ee385f80 100644 --- a/src/api/subsonic/SubsonicResource.cpp +++ b/src/api/subsonic/SubsonicResource.cpp @@ -36,9 +36,9 @@ #include "database/Track.hpp" #include "database/TrackList.hpp" #include "database/User.hpp" -#include "main/Service.hpp" #include "similarity/SimilaritySearcher.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "SubsonicId.hpp" #include "SubsonicResponse.hpp" diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp index d151e61a..19eea335 100644 --- a/src/av/AvTranscoder.cpp +++ b/src/av/AvTranscoder.cpp @@ -22,11 +22,11 @@ #include #include -#include "main/Service.hpp" #include "AvInfo.hpp" #include "utils/Config.hpp" #include "utils/Path.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" namespace Av { diff --git a/src/main/main.cpp b/src/main/main.cpp index ad585439..b09f044d 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -36,7 +36,7 @@ #include "ui/LmsApplication.hpp" #include "utils/Config.hpp" #include "utils/Logger.hpp" -#include "Service.hpp" +#include "utils/Service.hpp" std::vector generateWtConfig(std::string execPath) { diff --git a/src/similarity/features/AcousticBrainzUtils.cpp b/src/similarity/features/AcousticBrainzUtils.cpp index d550e06e..e58121c6 100644 --- a/src/similarity/features/AcousticBrainzUtils.cpp +++ b/src/similarity/features/AcousticBrainzUtils.cpp @@ -25,9 +25,9 @@ #include #include -#include "main/Service.hpp" #include "utils/Config.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" namespace AcousticBrainz diff --git a/src/similarity/features/SimilarityFeaturesCache.cpp b/src/similarity/features/SimilarityFeaturesCache.cpp index 4316af5e..1c9ed6b6 100644 --- a/src/similarity/features/SimilarityFeaturesCache.cpp +++ b/src/similarity/features/SimilarityFeaturesCache.cpp @@ -22,9 +22,9 @@ #include #include -#include "main/Service.hpp" #include "utils/Config.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" namespace Similarity { diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index 658abd5f..3758967b 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -29,8 +29,8 @@ #include "auth/AuthTokenService.hpp" #include "auth/PasswordService.hpp" -#include "main/Service.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 7e6fcb13..a76ea3ee 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -37,8 +37,8 @@ #include "database/Release.hpp" #include "database/User.hpp" #include "explore/Explore.hpp" -#include "main/Service.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "admin/InitWizardView.hpp" diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp index ae2baf48..92267aad 100644 --- a/src/ui/PlayQueueView.cpp +++ b/src/ui/PlayQueueView.cpp @@ -26,9 +26,9 @@ #include "database/Track.hpp" #include "database/TrackList.hpp" #include "database/User.hpp" -#include "main/Service.hpp" #include "similarity/SimilaritySearcher.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/SettingsView.cpp b/src/ui/SettingsView.cpp index 09a66732..4084bfc9 100644 --- a/src/ui/SettingsView.cpp +++ b/src/ui/SettingsView.cpp @@ -19,21 +19,21 @@ #include "SettingsView.hpp" -#include -#include #include #include -#include -#include - #include +#include +#include +#include +#include #include "common/Validators.hpp" #include "common/ValueStringModel.hpp" #include "auth/PasswordService.hpp" -#include "main/Service.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" + #include "LmsApplication.hpp" namespace UserInterface { diff --git a/src/ui/admin/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp index 6086eec7..b28dcefc 100644 --- a/src/ui/admin/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -28,8 +28,8 @@ #include "database/Cluster.hpp" #include "database/SimilaritySettings.hpp" -#include "main/Service.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "common/Validators.hpp" diff --git a/src/ui/admin/DatabaseStatus.cpp b/src/ui/admin/DatabaseStatus.cpp index d67aab6f..4d758eb6 100644 --- a/src/ui/admin/DatabaseStatus.cpp +++ b/src/ui/admin/DatabaseStatus.cpp @@ -26,7 +26,7 @@ #include #include -#include "main/Service.hpp" +#include "utils/Service.hpp" #include "scanner/MediaScanner.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/admin/InitWizardView.cpp b/src/ui/admin/InitWizardView.cpp index 50168110..28c7d350 100644 --- a/src/ui/admin/InitWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -24,9 +24,9 @@ #include #include "auth/PasswordService.hpp" -#include "main/Service.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "common/Validators.hpp" #include "LmsApplication.hpp" diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp index d08c2f83..a4bec9cc 100644 --- a/src/ui/admin/UserView.cpp +++ b/src/ui/admin/UserView.cpp @@ -30,10 +30,10 @@ #include "auth/PasswordService.hpp" #include "database/User.hpp" -#include "main/Service.hpp" #include "utils/Config.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "common/Validators.hpp" diff --git a/src/ui/explore/ArtistInfoView.cpp b/src/ui/explore/ArtistInfoView.cpp index e7c446f8..3c232a7c 100644 --- a/src/ui/explore/ArtistInfoView.cpp +++ b/src/ui/explore/ArtistInfoView.cpp @@ -20,8 +20,8 @@ #include "ArtistInfoView.hpp" #include "database/Artist.hpp" -#include "main/Service.hpp" #include "similarity/SimilaritySearcher.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "ArtistLink.hpp" diff --git a/src/ui/explore/ReleaseInfoView.cpp b/src/ui/explore/ReleaseInfoView.cpp index af402608..d3e7c238 100644 --- a/src/ui/explore/ReleaseInfoView.cpp +++ b/src/ui/explore/ReleaseInfoView.cpp @@ -22,8 +22,8 @@ #include #include "database/Release.hpp" -#include "main/Service.hpp" #include "similarity/SimilaritySearcher.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "ReleaseLink.hpp" diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp index 5f706fc6..f11a7301 100644 --- a/src/ui/resource/ImageResource.cpp +++ b/src/ui/resource/ImageResource.cpp @@ -24,9 +24,9 @@ #include "cover/CoverArtGrabber.hpp" #include "database/Track.hpp" -#include "main/Service.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" +#include "utils/Service.hpp" #include "utils/Utils.hpp" #include "LmsApplication.hpp" diff --git a/src/main/Service.hpp b/src/utils/Service.hpp similarity index 100% rename from src/main/Service.hpp rename to src/utils/Service.hpp