reapack

commit ad0678937197686e384664a765f53e5708b7a85d
parent 1c0d0df7738aded359ce52683ee38ba4aca361c2
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon,  7 Dec 2015 15:41:39 -0500

global refactoring: use nullptr

Diffstat:
M
src/database.cpp
 | 
2
+-
M
src/dialog.cpp
 | 
5
+++--
M
src/dialog.hpp
 | 
4
++--
M
src/download.cpp
 | 
8
++++----
M
src/package.cpp
 | 
4
++--
M
src/progress.cpp
 | 
6
+++---
M
src/reapack.cpp
 | 
8
++++----
M
src/version.cpp
 | 
2
+-
M
test/package.cpp
 | 
2
+-

9 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/database.cpp b/src/database.cpp
@@ -52,7 +52,7 @@ void Database::addCategory(Category *cat)
 }
 
 Category::Category(const string &name)
-  : m_database(0), m_name(name)
+  : m_database(nullptr), m_name(name)
 {
   if(m_name.empty())
     throw reapack_error("empty category name");
diff --git a/src/dialog.cpp b/src/dialog.cpp
@@ -4,7 +4,7 @@ DialogMap Dialog::s_instances;
 
 WDL_DLGRET Dialog::Proc(HWND handle, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-  Dialog *dlg = 0;
+  Dialog *dlg = nullptr;
 
   const auto it = Dialog::s_instances.find(handle);
   if(it != Dialog::s_instances.end())
@@ -50,7 +50,8 @@ WDL_DLGRET Dialog::Proc(HWND handle, UINT msg, WPARAM wParam, LPARAM lParam)
 }
 
 Dialog::Dialog(const int templateId)
-  : m_template(templateId), m_parent(0), m_handle(0), m_isVisible(false)
+  : m_template(templateId), m_isVisible(false),
+    m_parent(nullptr), m_handle(nullptr)
 {
   // can't call reimplemented virtual methods here during object construction
 }
diff --git a/src/dialog.hpp b/src/dialog.hpp
@@ -66,9 +66,9 @@ private:
   static DialogMap s_instances;
 
   const int m_template;
+  bool m_isVisible;
+
   HWND m_parent;
   HWND m_handle;
-
-  bool m_isVisible;
 };
 #endif
diff --git a/src/download.cpp b/src/download.cpp
@@ -13,7 +13,7 @@ static const int DOWNLOAD_TIMEOUT = 5;
 static const int CONCURRENT_DOWNLOADS = 3;
 
 Download::Download(const string &name, const string &url)
-  : m_name(name), m_url(url), m_threadHandle(0)
+  : m_name(name), m_url(url), m_threadHandle(nullptr)
 {
   reset();
 }
@@ -60,7 +60,7 @@ void Download::start()
 
   m_onStart();
 
-  m_threadHandle = CreateThread(NULL, 0, Worker, (void *)this, 0, 0);
+  m_threadHandle = CreateThread(nullptr, 0, Worker, (void *)this, 0, nullptr);
 }
 
 DWORD WINAPI Download::Worker(void *ptr)
@@ -146,7 +146,7 @@ Download *Download::NextFinished()
   WDL_MutexLock lock(&s_mutex);
 
   if(s_finished.empty())
-    return 0;
+    return nullptr;
 
   Download *dl = s_finished.front();
   s_finished.pop();
@@ -173,7 +173,7 @@ void Download::finishInMainThread()
 
   if(m_threadHandle) {
     CloseHandle(m_threadHandle);
-    m_threadHandle = 0;
+    m_threadHandle = nullptr;
   }
 
   m_onFinish();
diff --git a/src/package.cpp b/src/package.cpp
@@ -16,7 +16,7 @@ Package::Type Package::convertType(const char *type)
 }
 
 Package::Package(const Type type, const string &name)
-  : m_category(0), m_type(type), m_name(name)
+  : m_category(nullptr), m_type(type), m_name(name)
 {
   if(m_name.empty())
     throw reapack_error("empty package name");
@@ -55,7 +55,7 @@ Version *Package::version(const size_t index) const
 Version *Package::lastVersion() const
 {
   if(m_versions.empty())
-    return 0;
+    return nullptr;
 
   return *prev(m_versions.end());
 }
diff --git a/src/progress.cpp b/src/progress.cpp
@@ -10,8 +10,8 @@ using namespace std;
 
 Progress::Progress()
   : Dialog(IDD_PROGRESS_DIALOG),
-    m_transaction(0), m_current(0), m_label(0), m_progress(0),
-    m_done(0), m_total(0)
+    m_transaction(nullptr), m_current(nullptr), m_label(nullptr),
+    m_progress(nullptr), m_done(0), m_total(0)
 {
 }
 
@@ -61,7 +61,7 @@ void Progress::addDownload(Download *dl)
   dl->onFinish([=] {
     m_done++;
     updateProgress();
-    m_current = 0;
+    m_current = nullptr;
   });
 }
 
diff --git a/src/reapack.cpp b/src/reapack.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 
 ReaPack::ReaPack()
-  : m_config(0), m_transaction(0), m_progress(0)
+  : m_config(nullptr), m_transaction(nullptr), m_progress(nullptr)
 {
 }
 
@@ -125,7 +125,7 @@ void ReaPack::importRemote()
 Transaction *ReaPack::createTransaction()
 {
   if(m_transaction)
-    return 0;
+    return nullptr;
 
   m_transaction = new Transaction(m_config->registry(), m_resourcePath);
 
@@ -143,11 +143,11 @@ Transaction *ReaPack::createTransaction()
       Dialog::Show<Report>(m_instance, m_mainWindow, m_transaction);
 
     m_progress->setEnabled(true);
-    m_progress->setTransaction(0);
+    m_progress->setTransaction(nullptr);
     m_progress->hide();
 
     delete m_transaction;
-    m_transaction = 0;
+    m_transaction = nullptr;
 
     m_config->write();
   });
diff --git a/src/version.cpp b/src/version.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 Version::Version(const std::string &str)
-  : m_name(str), m_code(0), m_package(0)
+  : m_name(str), m_code(0), m_package(nullptr)
 {
   static const regex pattern("(\\d+)");
 
diff --git a/test/package.cpp b/test/package.cpp
@@ -52,7 +52,7 @@ TEST_CASE("drop empty version", M) {
   pack.addVersion(new Version("1"));
 
   REQUIRE(pack.versions().empty());
-  REQUIRE(pack.lastVersion() == 0);
+  REQUIRE(pack.lastVersion() == nullptr);
 }
 
 TEST_CASE("unknown target path", M) {