reapack

commit 0db329b89d49a5c85ef8c40025b9f79b84eba198
parent 4391381392ee58879dc504b524057a083e4b0138
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Fri,  6 May 2016 16:23:25 -0400

some refactoring

Diffstat:
M
src/reapack.cpp
 | 
6
+++---
M
src/report.cpp
 | 
20
++++++++++----------
M
src/report.hpp
 | 
6
+++---
M
src/transaction.hpp
 | 
2
+-

4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/reapack.cpp b/src/reapack.cpp
@@ -491,15 +491,15 @@ Transaction *ReaPack::setupTransaction()
     Dialog::Destroy(m_progress);
     m_progress = nullptr;
 
-    const Receipt *receipt = m_tx->receipt();
+    const Receipt &receipt = m_tx->receipt();
 
-    if(m_tx->isCancelled() || !receipt->isEnabled())
+    if(m_tx->isCancelled() || !receipt.isEnabled())
       return;
 
     LockDialog managerLock(m_manager);
     LockDialog cleanupLock(m_browser);
 
-    if(m_tx->taskCount() == 0 && !receipt->hasErrors())
+    if(m_tx->taskCount() == 0 && !receipt.hasErrors())
       ShowMessageBox("Nothing to do!", "ReaPack", MB_OK);
     else
       Dialog::Show<Report>(m_instance, m_mainWindow, receipt);
diff --git a/src/report.cpp b/src/report.cpp
@@ -82,17 +82,17 @@ void ReportDialog::printIndented(const string &text)
     m_stream << "\x20\x20" << line.substr(line.find_first_not_of('\x20')) << NL;
 }
 
-Report::Report(const Receipt *receipt)
+Report::Report(const Receipt &receipt)
   : ReportDialog(), m_receipt(receipt)
 {
 }
 
 void Report::fillReport()
 {
-  const size_t installs = m_receipt->installs().size();
-  const size_t updates = m_receipt->updates().size();
-  const size_t removals = m_receipt->removals().size();
-  const size_t errors = m_receipt->errors().size();
+  const size_t installs = m_receipt.installs().size();
+  const size_t updates = m_receipt.updates().size();
+  const size_t removals = m_receipt.removals().size();
+  const size_t errors = m_receipt.errors().size();
 
   stream()
     << installs << " installed packages, "
@@ -102,7 +102,7 @@ void Report::fillReport()
     << NL
   ;
 
-  if(m_receipt->isRestartNeeded()) {
+  if(m_receipt.isRestartNeeded()) {
     stream()
       << NL
       << "Notice: One or more native REAPER extensions were installed." << NL
@@ -127,7 +127,7 @@ void Report::printInstalls()
 {
   printHeader("Installed packages");
 
-  for(const InstallTicket &ticket : m_receipt->installs())
+  for(const InstallTicket &ticket : m_receipt.installs())
     stream() << ticket.version->fullName() << NL;
 }
 
@@ -137,7 +137,7 @@ void Report::printUpdates()
 
   const auto start = stream().tellp();
 
-  for(const InstallTicket &ticket : m_receipt->updates()) {
+  for(const InstallTicket &ticket : m_receipt.updates()) {
     const Package *pkg = ticket.version->package();
     const Registry::Entry &regEntry = ticket.regEntry;
     const VersionSet &versions = pkg->versions();
@@ -163,7 +163,7 @@ void Report::printErrors()
 
   const auto start = stream().tellp();
 
-  for(const Receipt::Error &err : m_receipt->errors()) {
+  for(const Receipt::Error &err : m_receipt.errors()) {
     if(stream().tellp() != start)
       stream() << NL;
 
@@ -176,7 +176,7 @@ void Report::printRemovals()
 {
   printHeader("Removed files");
 
-  for(const Path &path : m_receipt->removals())
+  for(const Path &path : m_receipt.removals())
     stream() << path.join() << NL;
 }
 
diff --git a/src/report.hpp b/src/report.hpp
@@ -20,12 +20,12 @@
 
 #include "dialog.hpp"
 
+#include "receipt.hpp"
 #include "registry.hpp"
 
 #include <sstream>
 
 class Package;
-class Receipt;
 class Version;
 
 class ReportDialog : public Dialog {
@@ -51,7 +51,7 @@ private:
 
 class Report : public ReportDialog {
 public:
-  Report(const Receipt *);
+  Report(const Receipt &);
 
 protected:
   void fillReport() override;
@@ -62,7 +62,7 @@ private:
   void printErrors();
   void printRemovals();
 
-  const Receipt *m_receipt;
+  Receipt m_receipt;
 };
 
 class History : public ReportDialog {
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -59,7 +59,7 @@ public:
   bool runTasks();
 
   bool isCancelled() const { return m_isCancelled; }
-  const Receipt *receipt() const { return &m_receipt; }
+  const Receipt &receipt() const { return m_receipt; }
   size_t taskCount() const { return m_tasks.size(); }
 
   DownloadQueue *downloadQueue() { return &m_downloadQueue; }