Use one struct for all args in Page::submit instead of multiple args (easier to add new fields without changing code)

Also remove submit_body_item from page.

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Youtube.hpp b/plugins/Youtube.hpp
index 53fb3b7..511c78a 100644
--- a/plugins/Youtube.hpp
+++ b/plugins/Youtube.hpp
@@ -46,8 +46,8 @@ namespace QuickMedia {
         bool search_is_filter() override { return false; }
         SearchResult search(const std::string &str, BodyItems &result_items) override;
         PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override;
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
-        PluginResult submit_suggestion(const std::string &title, const std::string &url, BodyItems &result_items) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
+        PluginResult submit_suggestion(const SubmitArgs &args, BodyItems &result_items) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
         bool lazy_fetch_is_loader() override { return true; }
     private:
@@ -71,7 +71,7 @@ namespace QuickMedia {
         YoutubeCommentsPage(Program *program, const std::string &video_url, const std::string &continuation_token) : LazyFetchPage(program), video_url(video_url), continuation_token(continuation_token) {}
         const char* get_title() const override { return "Comments"; }
         PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override;
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
     private:
         int current_page = 0;
@@ -84,7 +84,7 @@ namespace QuickMedia {
         YoutubeCommentRepliesPage(Program *program, const std::string &video_url, const std::string &continuation_token) : LazyFetchPage(program), video_url(video_url), continuation_token(continuation_token) {}
         const char* get_title() const override { return "Comment replies"; }
         PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override;
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
     private:
         int current_page = 0;
@@ -99,7 +99,7 @@ namespace QuickMedia {
         bool search_is_filter() override { return false; }
         SearchResult search(const std::string &str, BodyItems &result_items) override;
         PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override;
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
 
         TrackResult track(const std::string &str) override;
@@ -124,7 +124,7 @@ namespace QuickMedia {
     public:
         YoutubeSubscriptionsPage(Program *program) : LazyFetchPage(program) {}
         const char* get_title() const override { return "Subscriptions"; }
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
     private:
         std::array<AsyncTask<std::vector<YoutubeSubscriptionTaskResult>>, 4> subscription_load_tasks; // TODO: Use multiple curl outputs instead?
@@ -135,7 +135,7 @@ namespace QuickMedia {
         YoutubeRecommendedPage(Program *program) : LazyFetchPage(program) {}
         const char* get_title() const override { return "Recommended"; }
         PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override;
-        PluginResult submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
         PluginResult lazy_fetch(BodyItems &result_items) override;
         bool reload_on_page_change() override { return true; }
     private:
@@ -149,7 +149,7 @@ namespace QuickMedia {
     class YoutubeRelatedVideosPage : public RelatedVideosPage {
     public:
         YoutubeRelatedVideosPage(Program *program) : RelatedVideosPage(program) {}
-        PluginResult submit(const std::string&, const std::string&, std::vector<Tab> &result_tabs) override;
+        PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override;
     };
 
     class YoutubeVideoPage : public VideoPage {