WIP: Refractor C++-side. Loader should be working again

core/include/JellyfinQt/loader/http/activate.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addlistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/listingsproviderinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AddListingProvider : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ListingsProviderInfo, AddListingProviderParams> {
 public:
-	explicit AddListingProvider(ApiClient *apiClient);
+	explicit AddListingProvider(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AddListingProviderParams& parameters) const override;
+	QString path(const AddListingProviderParams& parameters) const override;
 	QUrlQuery query(const AddListingProviderParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/addmediapath.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtocollection.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtoplaylist.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtunerhost.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/tunerhostinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AddTunerHost : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::TunerHostInfo, AddTunerHostParams> {
 public:
-	explicit AddTunerHost(ApiClient *apiClient);
+	explicit AddTunerHost(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AddTunerHostParams& parameters) const override;
+	QString path(const AddTunerHostParams& parameters) const override;
 	QUrlQuery query(const AddTunerHostParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/addusertosession.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addvirtualfolder.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/applysearchcriteria.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/authenticateuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateUser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateUserParams> {
 public:
-	explicit AuthenticateUser(ApiClient *apiClient);
+	explicit AuthenticateUser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateUserParams& parameters) const override;
+	QString path(const AuthenticateUserParams& parameters) const override;
 	QUrlQuery query(const AuthenticateUserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authenticateuserbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateUserByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateUserByNameParams> {
 public:
-	explicit AuthenticateUserByName(ApiClient *apiClient);
+	explicit AuthenticateUserByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateUserByNameParams& parameters) const override;
+	QString path(const AuthenticateUserByNameParams& parameters) const override;
 	QUrlQuery query(const AuthenticateUserByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateWithQuickConnect : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateWithQuickConnectParams> {
 public:
-	explicit AuthenticateWithQuickConnect(ApiClient *apiClient);
+	explicit AuthenticateWithQuickConnect(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateWithQuickConnectParams& parameters) const override;
+	QString path(const AuthenticateWithQuickConnectParams& parameters) const override;
 	QUrlQuery query(const AuthenticateWithQuickConnectParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authorize.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/available.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/cancelpackageinstallation.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/cancelseriestimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/canceltimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/closelivestream.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/completewizard.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/connect.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/quickconnectresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class Connect : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::QuickConnectResult, ConnectParams> {
 public:
-	explicit Connect(ApiClient *apiClient);
+	explicit Connect(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ConnectParams& parameters) const override;
+	QString path(const ConnectParams& parameters) const override;
 	QUrlQuery query(const ConnectParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createadminnotification.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createcollection.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/collectioncreationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreateCollection : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::CollectionCreationResult, CreateCollectionParams> {
 public:
-	explicit CreateCollection(ApiClient *apiClient);
+	explicit CreateCollection(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreateCollectionParams& parameters) const override;
+	QString path(const CreateCollectionParams& parameters) const override;
 	QUrlQuery query(const CreateCollectionParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createkey.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createplaylist.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/playlistcreationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreatePlaylist : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::PlaylistCreationResult, CreatePlaylistParams> {
 public:
-	explicit CreatePlaylist(ApiClient *apiClient);
+	explicit CreatePlaylist(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreatePlaylistParams& parameters) const override;
+	QString path(const CreatePlaylistParams& parameters) const override;
 	QUrlQuery query(const CreatePlaylistParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createprofile.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createseriestimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createtimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createuserbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/userdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreateUserByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserDto, CreateUserByNameParams> {
 public:
-	explicit CreateUserByName(ApiClient *apiClient);
+	explicit CreateUserByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreateUserByNameParams& parameters) const override;
+	QString path(const CreateUserByNameParams& parameters) const override;
 	QUrlQuery query(const CreateUserByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/deauthorize.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletealternatesources.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletedevice.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitem.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitemimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitemimagebyindex.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitems.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletelistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteprofile.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleterecording.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletesubtitle.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletetunerhost.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuserimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuserimagebyindex.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuseritemrating.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/useritemdatadto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class DeleteUserItemRating : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserItemDataDto, DeleteUserItemRatingParams> {
 public:
-	explicit DeleteUserItemRating(ApiClient *apiClient);
+	explicit DeleteUserItemRating(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const DeleteUserItemRatingParams& parameters) const override;
+	QString path(const DeleteUserItemRatingParams& parameters) const override;
 	QUrlQuery query(const DeleteUserItemRatingParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/disableplugin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/discovertuners.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/discvovertuners.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/displaycontent.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/downloadremoteimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/downloadremotesubtitles.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/enableplugin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/forgotpassword.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/forgotpasswordresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class ForgotPassword : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ForgotPasswordResult, ForgotPasswordParams> {
 public:
-	explicit ForgotPassword(ApiClient *apiClient);
+	explicit ForgotPassword(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ForgotPasswordParams& parameters) const override;
+	QString path(const ForgotPasswordParams& parameters) const override;
 	QUrlQuery query(const ForgotPasswordParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/forgotpasswordpin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/pinredeemresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class ForgotPasswordPin : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::PinRedeemResult, ForgotPasswordPinParams> {
 public:
-	explicit ForgotPasswordPin(ApiClient *apiClient);
+	explicit ForgotPasswordPin(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ForgotPasswordPinParams& parameters) const override;
+	QString path(const ForgotPasswordPinParams& parameters) const override;
 	QUrlQuery query(const ForgotPasswordPinParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/get.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/searchhintresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class Get : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::SearchHintResult, GetParams> {
 public:
-	explicit Get(ApiClient *apiClient);
+	explicit Get(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetParams& parameters) const override;
+	QString path(const GetParams& parameters) const override;
 	QUrlQuery query(const GetParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getadditionalpart.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetAdditionalPart : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetAdditionalPartParams> {
 public:
-	explicit GetAdditionalPart(ApiClient *apiClient);
+	explicit GetAdditionalPart(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetAdditionalPartParams& parameters) const override;
+	QString path(const GetAdditionalPartParams& parameters) const override;
 	QUrlQuery query(const GetAdditionalPartParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getalbumartists.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetAlbumArtists : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetAlbumArtistsParams> {
 public:
-	explicit GetAlbumArtists(ApiClient *apiClient);
+	explicit GetAlbumArtists(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetAlbumArtistsParams& parameters) const override;
+	QString path(const GetAlbumArtistsParams& parameters) const override;
 	QUrlQuery query(const GetAlbumArtistsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getallchannelfeatures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getancestors.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getartistbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetArtistByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDto, GetArtistByNameParams> {
 public:
-	explicit GetArtistByName(ApiClient *apiClient);
+	explicit GetArtistByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetArtistByNameParams& parameters) const override;
+	QString path(const GetArtistByNameParams& parameters) const override;
 	QUrlQuery query(const GetArtistByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getartistimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getartists.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetArtists : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetArtistsParams> {
 public:
-	explicit GetArtists(ApiClient *apiClient);
+	explicit GetArtists(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetArtistsParams& parameters) const override;
+	QString path(const GetArtistsParams& parameters) const override;
 	QUrlQuery query(const GetArtistsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getattachment.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getaudiostream.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getaudiostreambycontainer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getauthproviders.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbitratetestbytes.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbookremotesearchresults.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getboxsetremotesearchresults.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingcss.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingcss_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/brandingoptions.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetBrandingOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BrandingOptions, GetBrandingOptionsParams> {
 public:
-	explicit GetBrandingOptions(ApiClient *apiClient);
+	explicit GetBrandingOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetBrandingOptionsParams& parameters) const override;
+	QString path(const GetBrandingOptionsParams& parameters) const override;
 	QUrlQuery query(const GetBrandingOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannel.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannel : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDto, GetChannelParams> {
 public:
-	explicit GetChannel(ApiClient *apiClient);
+	explicit GetChannel(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelParams& parameters) const override;
+	QString path(const GetChannelParams& parameters) const override;
 	QUrlQuery query(const GetChannelParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelfeatures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/channelfeatures.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelFeatures : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ChannelFeatures, GetChannelFeaturesParams> {
 public:
-	explicit GetChannelFeatures(ApiClient *apiClient);
+	explicit GetChannelFeatures(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelFeaturesParams& parameters) const override;
+	QString path(const GetChannelFeaturesParams& parameters) const override;
 	QUrlQuery query(const GetChannelFeaturesParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelitems.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelItems : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetChannelItemsParams> {
 public:
-	explicit GetChannelItems(ApiClient *apiClient);
+	explicit GetChannelItems(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelItemsParams& parameters) const override;
+	QString path(const GetChannelItemsParams& parameters) const override;
 	QUrlQuery query(const GetChannelItemsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelmappingoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/channelmappingoptionsdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelMappingOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ChannelMappingOptionsDto, GetChannelMappingOptionsParams> {
 public:
-	explicit GetChannelMappingOptions(ApiClient *apiClient);
+	explicit GetChannelMappingOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelMappingOptionsParams& parameters) const override;
+	QString path(const GetChannelMappingOptionsParams& parameters) const override;
 	QUrlQuery query(const GetChannelMappingOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannels.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannels : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetChannelsParams> {
 public:
-	explicit GetChannels(ApiClient *apiClient);
+	explicit GetChannels(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelsParams& parameters) const override;
+	QString path(const GetChannelsParams& parameters) const override;
 	QUrlQuery query(const GetChannelsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getconfiguration.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/serverconfiguration.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetConfiguration : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ServerConfiguration, GetConfigurationParams> {
 public:
-	explicit GetConfiguration(ApiClient *apiClient);
+	explicit GetConfiguration(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetConfigurationParams& parameters) const override;
+	QString path(const GetConfigurationParams& parameters) const override;
 	QUrlQuery query(const GetConfigurationParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getconfigurationpages.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager_3.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory_3.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcountries.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcriticreviews.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetCriticReviews : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetCriticReviewsParams> {
 public:
-	explicit GetCriticReviews(ApiClient *apiClient);
+	explicit GetCriticReviews(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetCriticReviewsParams& parameters) const override;
+	QString path(const GetCriticReviewsParams& parameters) const override;
 	QUrlQuery query(const GetCriticReviewsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getcultures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcurrentuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/userdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetCurrentUser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserDto, GetCurrentUserParams> {
 public:
-	explicit GetCurrentUser(ApiClient *apiClient);
+	explicit GetCurrentUser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetCurrentUserParams& parameters) const override;
+	QString path(const GetCurrentUserParams& parameters) const override;
 	QUrlQuery query(const GetCurrentUserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdashboardconfigurationpage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/defaultdirectorybrowserinfodto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultDirectoryBrowser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DefaultDirectoryBrowserInfoDto, GetDefaultDirectoryBrowserParams> {
 public:
-	explicit GetDefaultDirectoryBrowser(ApiClient *apiClient);
+	explicit GetDefaultDirectoryBrowser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultDirectoryBrowserParams& parameters) const override;
+	QString path(const GetDefaultDirectoryBrowserParams& parameters) const override;
 	QUrlQuery query(const GetDefaultDirectoryBrowserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/listingsproviderinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultListingProvider : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ListingsProviderInfo, GetDefaultListingProviderParams> {
 public:
-	explicit GetDefaultListingProvider(ApiClient *apiClient);
+	explicit GetDefaultListingProvider(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultListingProviderParams& parameters) const override;
+	QString path(const GetDefaultListingProviderParams& parameters) const override;
 	QUrlQuery query(const GetDefaultListingProviderParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/metadataoptions.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultMetadataOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::MetadataOptions, GetDefaultMetadataOptionsParams> {
 public:
-	explicit GetDefaultMetadataOptions(ApiClient *apiClient);
+	explicit GetDefaultMetadataOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultMetadataOptionsParams& parameters) const override;
+	QString path(const GetDefaultMetadataOptionsParams& parameters) const override;
 	QUrlQuery query(const GetDefaultMetadataOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaultprofile.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/deviceprofile.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultProfile : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DeviceProfile, GetDefaultProfileParams> {
 public:
-	explicit GetDefaultProfile(ApiClient *apiClient);
+	explicit GetDefaultProfile(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultProfileParams& parameters) const override;
+	QString path(const GetDefaultProfileParams& parameters) const override;
 	QUrlQuery query(const GetDefaultProfileParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaulttimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/seriestimerinfodto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultTimer : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::SeriesTimerInfoDto, GetDefaultTimerParams> {
 public:
-	explicit GetDefaultTimer(ApiClient *apiClient);
+	explicit GetDefaultTimer(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultTimerParams& parameters) const override;
+	QString path(const GetDefaultTimerParams& parameters) const override;
 	QUrlQuery query(const GetDefaultTimerParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdescriptionxml.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getdescriptionxml_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getdeviceinfo.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/deviceinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDeviceInfo : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DeviceInfo, GetDeviceInfoParams> {
 public:
-	explicit GetDeviceInfo(ApiClient *apiClient);
+	explicit GetDeviceInfo(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDeviceInfoParams& parameters) const override;
+	QString path(const GetDeviceInfoParams& parameters) const override;
 	QUrlQuery query(const GetDeviceInfoParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdeviceoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/deviceoptions.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDeviceOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DeviceOptions, GetDeviceOptionsParams> {
 public:
-	explicit GetDeviceOptions(ApiClient *apiClient);
+	explicit GetDeviceOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDeviceOptionsParams& parameters) const override;
+	QString path(const GetDeviceOptionsParams& parameters) const override;
 	QUrlQuery query(const GetDeviceOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdevices.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/deviceinfoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDevices : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DeviceInfoQueryResult, GetDevicesParams> {
 public:
-	explicit GetDevices(ApiClient *apiClient);
+	explicit GetDevices(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDevicesParams& parameters) const override;
+	QString path(const GetDevicesParams& parameters) const override;
 	QUrlQuery query(const GetDevicesParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdirectorycontents.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {