From 5f37e5d05279c3d5a221c1d4016d02c23bf88f73 Mon Sep 17 00:00:00 2001 From: APTX Date: Wed, 13 Jun 2012 22:26:12 +0200 Subject: [PATCH] Remove Database argument from all *Task classes --- localmylist/abstracttask.cpp | 5 ++--- localmylist/abstracttask.h | 2 +- localmylist/addfiletask.cpp | 4 ++-- localmylist/addfiletask.h | 2 +- localmylist/animetitleparsetask.cpp | 2 +- localmylist/directoryscantask.cpp | 4 ++-- localmylist/directoryscantask.h | 2 +- localmylist/mylistexportparsetask.cpp | 2 +- localmylist/unknownfilelookuptask.cpp | 4 ++-- localmylist/unknownfilelookuptask.h | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/localmylist/abstracttask.cpp b/localmylist/abstracttask.cpp index aa351bd..4822e9b 100644 --- a/localmylist/abstracttask.cpp +++ b/localmylist/abstracttask.cpp @@ -2,10 +2,9 @@ namespace LocalMyList { -AbstractTask::AbstractTask(Database *db, QObject *parent) : - QObject(parent) +AbstractTask::AbstractTask(QObject *parent) : + QObject(parent), db(0) { - this->db = db; connect(this, SIGNAL(nextWorkUnit()), this, SLOT(doNextWorkUnit()), Qt::QueuedConnection); } diff --git a/localmylist/abstracttask.h b/localmylist/abstracttask.h index 97a2fa1..e537c87 100644 --- a/localmylist/abstracttask.h +++ b/localmylist/abstracttask.h @@ -12,7 +12,7 @@ class LOCALMYLISTSHARED_EXPORT AbstractTask : public QObject { Q_OBJECT public: - explicit AbstractTask(Database *db = 0, QObject *parent = 0); + explicit AbstractTask(QObject *parent = 0); virtual ~AbstractTask(); virtual QString taskName() const; diff --git a/localmylist/addfiletask.cpp b/localmylist/addfiletask.cpp index bb50ce7..8d8a2b2 100644 --- a/localmylist/addfiletask.cpp +++ b/localmylist/addfiletask.cpp @@ -11,8 +11,8 @@ namespace LocalMyList { using namespace AniDBUdpClient; -AddFileTask::AddFileTask(Database *db, QObject *parent) : - AbstractTask(db, parent), hashResult(0) +AddFileTask::AddFileTask(QObject *parent) : + AbstractTask(parent), hashResult(0) { } diff --git a/localmylist/addfiletask.h b/localmylist/addfiletask.h index 982923d..95e8eb7 100644 --- a/localmylist/addfiletask.h +++ b/localmylist/addfiletask.h @@ -23,7 +23,7 @@ class LOCALMYLISTSHARED_EXPORT AddFileTask : public AbstractTask Q_PROPERTY(QFileInfo file READ file WRITE setFile) public: - explicit AddFileTask(Database *db = 0, QObject *parent = 0); + explicit AddFileTask(QObject *parent = 0); ~AddFileTask(); QFileInfo file() const; diff --git a/localmylist/animetitleparsetask.cpp b/localmylist/animetitleparsetask.cpp index 3c86d8e..28a6ec7 100644 --- a/localmylist/animetitleparsetask.cpp +++ b/localmylist/animetitleparsetask.cpp @@ -8,7 +8,7 @@ namespace LocalMyList { AnimeTitleParseTask::AnimeTitleParseTask(QObject *parent) : - AbstractTask(0, parent) + AbstractTask(parent) { } diff --git a/localmylist/directoryscantask.cpp b/localmylist/directoryscantask.cpp index c9be688..5b6a012 100644 --- a/localmylist/directoryscantask.cpp +++ b/localmylist/directoryscantask.cpp @@ -7,8 +7,8 @@ namespace LocalMyList { -DirectoryScanTask::DirectoryScanTask(Database *db, QObject *parent) : - AbstractTask(db, parent) +DirectoryScanTask::DirectoryScanTask(QObject *parent) : + AbstractTask(parent) { } diff --git a/localmylist/directoryscantask.h b/localmylist/directoryscantask.h index 2ef3f7a..cd010a0 100644 --- a/localmylist/directoryscantask.h +++ b/localmylist/directoryscantask.h @@ -15,7 +15,7 @@ class LOCALMYLISTSHARED_EXPORT DirectoryScanTask : public AbstractTask Q_PROPERTY(QDir directory READ directory WRITE setDirectory) public: - explicit DirectoryScanTask(Database *db = 0, QObject *parent = 0); + explicit DirectoryScanTask(QObject *parent = 0); QDir directory() const; diff --git a/localmylist/mylistexportparsetask.cpp b/localmylist/mylistexportparsetask.cpp index bd64338..a0c7e33 100644 --- a/localmylist/mylistexportparsetask.cpp +++ b/localmylist/mylistexportparsetask.cpp @@ -7,7 +7,7 @@ namespace LocalMyList { MyListExportParseTask::MyListExportParseTask(QObject *parent) : - AbstractTask(0, parent), QXmlStreamReader() + AbstractTask(parent), QXmlStreamReader() { dateTimeFormat = "dd.MM.yyyy hh:mm"; dateFormat = "dd.MM.yyyy"; diff --git a/localmylist/unknownfilelookuptask.cpp b/localmylist/unknownfilelookuptask.cpp index 78f6bce..7519ddc 100644 --- a/localmylist/unknownfilelookuptask.cpp +++ b/localmylist/unknownfilelookuptask.cpp @@ -4,8 +4,8 @@ namespace LocalMyList { -UnknownFileLookupTask::UnknownFileLookupTask(Database *db, QObject *parent) : - AbstractTask(db, parent) +UnknownFileLookupTask::UnknownFileLookupTask(QObject *parent) : + AbstractTask(parent) { } diff --git a/localmylist/unknownfilelookuptask.h b/localmylist/unknownfilelookuptask.h index 856af8a..b012fb1 100644 --- a/localmylist/unknownfilelookuptask.h +++ b/localmylist/unknownfilelookuptask.h @@ -9,7 +9,7 @@ class LOCALMYLISTSHARED_EXPORT UnknownFileLookupTask : public AbstractTask { Q_OBJECT public: - explicit UnknownFileLookupTask(Database *db, QObject *parent = 0); + explicit UnknownFileLookupTask(QObject *parent = 0); QString taskSubject() const; bool canUseThreads() const; -- 2.52.0