From dbf18db3a3c6831fe655581cb601accd055effd4 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 11 Jul 2021 01:12:50 +0200 Subject: [PATCH] No need to pass Application to RadioBackend --- src/radios/radiobackend.cpp | 4 +--- src/radios/radiobackend.h | 4 +--- src/radios/radioservices.cpp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/radios/radiobackend.cpp b/src/radios/radiobackend.cpp index 9a977df49..15a867e1c 100644 --- a/src/radios/radiobackend.cpp +++ b/src/radios/radiobackend.cpp @@ -22,15 +22,13 @@ #include #include "core/logging.h" -#include "core/application.h" #include "core/database.h" #include "core/song.h" #include "radiobackend.h" #include "radiochannel.h" -RadioBackend::RadioBackend(Application *app, Database *db, QObject *parent) +RadioBackend::RadioBackend(Database *db, QObject *parent) : QObject(parent), - app_(app), db_(db), original_thread_(thread()) {} diff --git a/src/radios/radiobackend.h b/src/radios/radiobackend.h index ccc3465eb..be5b1bf46 100644 --- a/src/radios/radiobackend.h +++ b/src/radios/radiobackend.h @@ -24,14 +24,13 @@ #include "radiochannel.h" -class Application; class Database; class RadioBackend : public QObject { Q_OBJECT public: - explicit RadioBackend(Application *app, Database *db, QObject *parent = nullptr); + explicit RadioBackend(Database *db, QObject *parent = nullptr); void Close(); void ExitAsync(); @@ -53,7 +52,6 @@ class RadioBackend : public QObject { void Exit(); private: - Application *app_; Database *db_; QThread *original_thread_; }; diff --git a/src/radios/radioservices.cpp b/src/radios/radioservices.cpp index ac3520d6c..f8e6bf12d 100644 --- a/src/radios/radioservices.cpp +++ b/src/radios/radioservices.cpp @@ -38,7 +38,7 @@ RadioServices::RadioServices(Application *app, QObject *parent) model_(new RadioModel(app, this)), channels_refresh_(false) { - backend_ = new RadioBackend(app, app->database()); + backend_ = new RadioBackend(app->database()); app->MoveToThread(backend_, app->database()->thread()); QObject::connect(backend_, &RadioBackend::NewChannels, this, &RadioServices::GotChannelsFromBackend);