reapack

commit 38dc17391276191a81454f305c6217e621913a37
parent 8abac0f6ca77eed7d90390736b6b2e006ba82913
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Wed, 27 Jul 2016 21:38:46 -0400

remove useless code since the "Nothing to be done" dialog was removed

Diffstat:
M
src/reapack.cpp
 | 
5
++---
M
src/receipt.cpp
 | 
9
+++++++++
M
src/receipt.hpp
 | 
3
+--
M
src/transaction.cpp
 | 
8
--------
M
src/transaction.hpp
 | 
1
-

5 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/reapack.cpp b/src/reapack.cpp
@@ -428,14 +428,13 @@ Transaction *ReaPack::setupTransaction()
 
     const Receipt &receipt = m_tx->receipt();
 
-    if(m_tx->isCancelled() || !receipt.isEnabled())
+    if(m_tx->isCancelled() || receipt.empty())
       return;
 
     LockDialog managerLock(m_manager);
     LockDialog browserLock(m_browser);
 
-    if(m_tx->taskCount() > 0 || receipt.hasErrors())
-      Dialog::Show<Report>(m_instance, m_mainWindow, receipt);
+    Dialog::Show<Report>(m_instance, m_mainWindow, receipt);
   });
 
   m_tx->setCleanupHandler([=] {
diff --git a/src/receipt.cpp b/src/receipt.cpp
@@ -24,6 +24,15 @@ Receipt::Receipt()
 {
 }
 
+bool Receipt::empty() const
+{
+ return
+   m_installs.empty() &&
+   m_updates.empty() &&
+   m_removals.empty() &&
+   m_errors.empty();
+}
+
 void Receipt::addTicket(const InstallTicket &ticket)
 {
   switch(ticket.type) {
diff --git a/src/receipt.hpp b/src/receipt.hpp
@@ -43,8 +43,7 @@ public:
 
   Receipt();
 
-  bool isEnabled() const { return m_enabled; }
-  void setEnabled(bool newVal) { m_enabled = newVal; }
+  bool empty() const;
 
   bool isRestartNeeded() const { return m_needRestart; }
   void setRestartNeeded(bool newVal) { m_needRestart = newVal; }
diff --git a/src/transaction.cpp b/src/transaction.cpp
@@ -72,9 +72,6 @@ Transaction::~Transaction()
 
 void Transaction::synchronize(const Remote &remote, const bool forceAutoInstall)
 {
-  // show the report dialog or "nothing to do" even if no task are ran
-  m_receipt.setEnabled(true);
-
   InstallOpts opts = *m_config->install();
   if(forceAutoInstall)
     opts.autoInstall = true;
@@ -160,8 +157,6 @@ void Transaction::install(const Version *ver)
 void Transaction::install(const Version *ver,
   const Registry::Entry &regEntry)
 {
-  m_receipt.setEnabled(true);
-
   InstallTicket::Type type;
 
   if(regEntry && regEntry.version < *ver)
@@ -218,7 +213,6 @@ void Transaction::install(const Version *ver,
   });
 
   addTask(task);
-  m_receipt.setEnabled(true);
 }
 
 void Transaction::registerAll(const Remote &remote)
@@ -293,7 +287,6 @@ void Transaction::uninstall(const Registry::Entry &entry)
   });
 
   addTask(task);
-  m_receipt.setEnabled(true);
 }
 
 bool Transaction::saveFile(Download *dl, const Path &path)
@@ -335,7 +328,6 @@ void Transaction::finish()
 void Transaction::addError(const string &message, const string &title)
 {
   m_receipt.addError({message, title});
-  m_receipt.setEnabled(true);
 }
 
 bool Transaction::allFilesExists(const set<Path> &list) const
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -61,7 +61,6 @@ public:
 
   bool isCancelled() const { return m_isCancelled; }
   const Receipt &receipt() const { return m_receipt; }
-  size_t taskCount() const { return m_tasks.size(); }
 
   DownloadQueue *downloadQueue() { return &m_downloadQueue; }
   Config *config() { return m_config; }