reapack

commit 62690cd8cc894565e53cb4bd26855c2df89c74d0
parent b4e46f426cfc6faf5fd853cec3ed9703a33cb64e
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sun, 26 Feb 2017 19:44:26 -0500

refactoring – forgot to put ThreadTask members as private

Diffstat:
M
src/archive.cpp
 | 
2
+-
M
src/download.cpp
 | 
6
+++---
M
src/thread.cpp
 | 
1
-
M
src/thread.hpp
 | 
2
++

4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/archive.cpp b/src/archive.cpp
@@ -150,7 +150,7 @@ void ImportArchive::importPackage(const string &data)
       % m_lastIndex->name() % categoryName % packageName % versionName);
   }
 
-  m_tx->install(ver, pinned, m_reader);
+  // m_tx->install(ver, pinned, m_reader);
 }
 
 size_t Archive::create(const auto_string &path, ReaPack *reapack)
diff --git a/src/download.cpp b/src/download.cpp
@@ -99,7 +99,7 @@ size_t Download::WriteData(char *data, size_t rawsize, size_t nmemb, void *ptr)
 int Download::UpdateProgress(void *ptr, const double, const double,
     const double, const double)
 {
-  return static_cast<Download *>(ptr)->m_abort;
+  return static_cast<Download *>(ptr)->aborted();
 }
 
 Download::Download(const string &name, const string &url,
@@ -128,7 +128,7 @@ void Download::run(DownloadContext *ctx)
     ThreadNotifier::get()->notify({this, state});
   };
 
-  if(m_abort) {
+  if(aborted()) {
     finish(Aborted, "cancelled");
     return;
   }
@@ -157,7 +157,7 @@ void Download::run(DownloadContext *ctx)
 
   const CURLcode res = curl_easy_perform(ctx->m_curl);
 
-  if(m_abort)
+  if(aborted())
     finish(Aborted, "aborted by user");
   else if(res != CURLE_OK) {
     const auto err = format("%s (%d): %s") % curl_easy_strerror(res) % res % errbuf;
diff --git a/src/thread.cpp b/src/thread.cpp
@@ -63,7 +63,6 @@ WorkerThread::WorkerThread() : m_exit(false)
 
 WorkerThread::~WorkerThread()
 {
-  // remove all pending tasks then wake the thread to make it exit
   m_exit = true;
   SetEvent(m_wake);
 
diff --git a/src/thread.hpp b/src/thread.hpp
@@ -61,8 +61,10 @@ public:
   void onFinish(const VoidSignal::slot_type &slot) { m_onFinish.connect(slot); }
   void setCleanupHandler(const CleanupHandler &cb) { m_cleanupHandler = cb; }
 
+  bool aborted() const { return m_abort; }
   void abort() { m_abort = true; }
 
+private:
   State m_state;
   std::atomic_bool m_abort;