From a7cd1fbf976e3a64755992a621324864a80b0237 Mon Sep 17 00:00:00 2001 From: fourtf Date: Tue, 20 Aug 2019 20:27:16 +0200 Subject: [PATCH] removed unused files --- chatterino.pro | 8 +--- .../{NetworkData.cpp => NetworkPrivate.cpp} | 4 +- .../{NetworkData.hpp => NetworkPrivate.hpp} | 17 +++++++- src/common/NetworkRequest.cpp | 3 +- src/common/NetworkRequest.hpp | 3 -- src/common/NetworkRequester.hpp | 15 ------- src/common/NetworkTimer.cpp | 41 ------------------- src/common/NetworkTimer.hpp | 36 ---------------- src/common/NetworkWorker.hpp | 15 ------- 9 files changed, 20 insertions(+), 122 deletions(-) rename src/common/{NetworkData.cpp => NetworkPrivate.cpp} (98%) rename src/common/{NetworkData.hpp => NetworkPrivate.hpp} (85%) delete mode 100644 src/common/NetworkRequester.hpp delete mode 100644 src/common/NetworkTimer.cpp delete mode 100644 src/common/NetworkTimer.hpp delete mode 100644 src/common/NetworkWorker.hpp diff --git a/chatterino.pro b/chatterino.pro index 1d2cdc61..0cd955c1 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -82,11 +82,10 @@ SOURCES += \ src/common/DownloadManager.cpp \ src/common/Env.cpp \ src/common/LinkParser.cpp \ - src/common/NetworkData.cpp \ + src/common/NetworkPrivate.cpp \ src/common/NetworkManager.cpp \ src/common/NetworkRequest.cpp \ src/common/NetworkResult.cpp \ - src/common/NetworkTimer.cpp \ src/common/UsernameSet.cpp \ src/controllers/accounts/Account.cpp \ src/controllers/accounts/AccountController.cpp \ @@ -241,13 +240,10 @@ HEADERS += \ src/common/DownloadManager.hpp \ src/common/LinkParser.hpp \ src/common/NetworkCommon.hpp \ - src/common/NetworkData.hpp \ + src/common/NetworkPrivate.hpp \ src/common/NetworkManager.hpp \ src/common/NetworkRequest.hpp \ - src/common/NetworkRequester.hpp \ src/common/NetworkResult.hpp \ - src/common/NetworkTimer.hpp \ - src/common/NetworkWorker.hpp \ src/common/NullablePtr.hpp \ src/common/ProviderId.hpp \ src/common/SignalVector.hpp \ diff --git a/src/common/NetworkData.cpp b/src/common/NetworkPrivate.cpp similarity index 98% rename from src/common/NetworkData.cpp rename to src/common/NetworkPrivate.cpp index 06e9433c..779127df 100644 --- a/src/common/NetworkData.cpp +++ b/src/common/NetworkPrivate.cpp @@ -1,9 +1,7 @@ -#include "common/NetworkData.hpp" +#include "common/NetworkPrivate.hpp" #include "common/NetworkManager.hpp" -#include "common/NetworkRequester.hpp" #include "common/NetworkResult.hpp" -#include "common/NetworkWorker.hpp" #include "common/Outcome.hpp" #include "debug/AssertInGuiThread.hpp" #include "debug/Log.hpp" diff --git a/src/common/NetworkData.hpp b/src/common/NetworkPrivate.hpp similarity index 85% rename from src/common/NetworkData.hpp rename to src/common/NetworkPrivate.hpp index f3f571fb..68980f73 100644 --- a/src/common/NetworkData.hpp +++ b/src/common/NetworkPrivate.hpp @@ -1,7 +1,6 @@ #pragma once #include "common/NetworkCommon.hpp" -#include "common/NetworkTimer.hpp" #include #include @@ -12,6 +11,22 @@ namespace chatterino { class NetworkResult; +class NetworkRequester : public QObject +{ + Q_OBJECT + +signals: + void requestUrl(); +}; + +class NetworkWorker : public QObject +{ + Q_OBJECT + +signals: + void doneUrl(); +}; + struct NetworkData { NetworkData(); ~NetworkData(); diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp index ece6413d..0eeb562c 100644 --- a/src/common/NetworkRequest.cpp +++ b/src/common/NetworkRequest.cpp @@ -1,7 +1,6 @@ #include "common/NetworkRequest.hpp" -#include "common/NetworkData.hpp" -//#include "common/NetworkManager.hpp" +#include "common/NetworkPrivate.hpp" #include "common/Outcome.hpp" #include "common/Version.hpp" #include "debug/AssertInGuiThread.hpp" diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp index f9ec282f..71cb5fc8 100644 --- a/src/common/NetworkRequest.hpp +++ b/src/common/NetworkRequest.hpp @@ -1,10 +1,7 @@ #pragma once #include "common/NetworkCommon.hpp" -#include "common/NetworkRequester.hpp" #include "common/NetworkResult.hpp" -#include "common/NetworkTimer.hpp" -#include "common/NetworkWorker.hpp" #include diff --git a/src/common/NetworkRequester.hpp b/src/common/NetworkRequester.hpp deleted file mode 100644 index 95664494..00000000 --- a/src/common/NetworkRequester.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -namespace chatterino { - -class NetworkRequester : public QObject -{ - Q_OBJECT - -signals: - void requestUrl(); -}; - -} // namespace chatterino diff --git a/src/common/NetworkTimer.cpp b/src/common/NetworkTimer.cpp deleted file mode 100644 index d8112571..00000000 --- a/src/common/NetworkTimer.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "common/NetworkTimer.hpp" - -#include "common/NetworkWorker.hpp" - -#include - -#include - -namespace chatterino { - -void NetworkTimer::start() -{ - if (this->timeoutMS_ <= 0) - { - return; - } - - this->timer_ = new QTimer; - this->timer_->start(this->timeoutMS_); - QObject::connect(this->timer_, &QTimer::timeout, [timer = this->timer_] { - timer->deleteLater(); // - }); - - this->started_ = true; -} - -bool NetworkTimer::isStarted() const -{ - return this->started_; -} - -void NetworkTimer::onTimeout(NetworkWorker *worker, - std::function cb) const -{ - assert(this->timer_ != nullptr); - assert(worker != nullptr); - - QObject::connect(this->timer_, &QTimer::timeout, worker, cb); -} - -} // namespace chatterino diff --git a/src/common/NetworkTimer.hpp b/src/common/NetworkTimer.hpp deleted file mode 100644 index fc2e25ab..00000000 --- a/src/common/NetworkTimer.hpp +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include - -class QTimer; - -namespace chatterino { - -class NetworkWorker; - -class NetworkTimer -{ - QTimer *timer_ = nullptr; - - bool started_{}; - -public: - int timeoutMS_ = -1; - - NetworkTimer() = default; - ~NetworkTimer() = default; - - NetworkTimer(const NetworkTimer &other) = delete; - NetworkTimer &operator=(const NetworkTimer &other) = delete; - - NetworkTimer(NetworkTimer &&other) = default; - NetworkTimer &operator=(NetworkTimer &&other) = default; - - void start(); - - void onTimeout(NetworkWorker *worker, std::function cb) const; - - bool isStarted() const; -}; - -} // namespace chatterino diff --git a/src/common/NetworkWorker.hpp b/src/common/NetworkWorker.hpp deleted file mode 100644 index b63bb15b..00000000 --- a/src/common/NetworkWorker.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -namespace chatterino { - -class NetworkWorker : public QObject -{ - Q_OBJECT - -signals: - void doneUrl(); -}; - -} // namespace chatterino