reapack

commit c81738cefa6395fad3cad0a9fbe8213d4e09dbaf
parent f331956f81316351f0a692bc862881e828ba2edb
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon, 18 Jan 2016 21:19:33 -0500

mild refactoring

Diffstat:
M
src/manager.cpp
 | 
1
+
M
src/manager.hpp
 | 
2
+-
M
src/registry.cpp
 | 
4
++--
M
src/registry.hpp
 | 
6
+++---
M
src/report.cpp
 | 
2
+-
M
src/transaction.cpp
 | 
4
++--
M
src/transaction.hpp
 | 
2
+-
M
test/registry.cpp
 | 
10
+++++-----

8 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -21,6 +21,7 @@
 #include "encoding.hpp"
 #include "menu.hpp"
 #include "reapack.hpp"
+#include "remote.hpp"
 #include "resource.hpp"
 
 static const int ACTION_ENABLE = 300;
diff --git a/src/manager.hpp b/src/manager.hpp
@@ -21,11 +21,11 @@
 #include "dialog.hpp"
 
 #include "listview.hpp"
-#include "remote.hpp"
 
 #include <map>
 
 class ReaPack;
+class Remote;
 
 class Manager : public Dialog {
 public:
diff --git a/src/registry.cpp b/src/registry.cpp
@@ -117,7 +117,7 @@ void Registry::push(Version *ver)
   }
 }
 
-Registry::QueryResult Registry::query(Package *pkg) const
+Registry::Entry Registry::query(Package *pkg) const
 {
   int id = 0;
   uint64_t version = 0;
@@ -144,7 +144,7 @@ Registry::QueryResult Registry::query(Package *pkg) const
   return {id, status, version};
 }
 
-set<Path> Registry::getFiles(const QueryResult &qr) const
+set<Path> Registry::getFiles(const Entry &qr) const
 {
   set<Path> list;
 
diff --git a/src/registry.hpp b/src/registry.hpp
@@ -38,14 +38,14 @@ public:
     Uninstalled,
   };
 
-  struct QueryResult {
+  struct Entry {
     int id; // internal use
     Status status;
     uint64_t version;
   };
 
-  QueryResult query(Package *) const;
-  std::set<Path> getFiles(const QueryResult &) const;
+  Entry query(Package *) const;
+  std::set<Path> getFiles(const Entry &) const;
   void push(Version *);
   void commit();
 
diff --git a/src/report.cpp b/src/report.cpp
@@ -89,7 +89,7 @@ void Report::formatUpdates(ostringstream &text)
 
   for(const Transaction::PackageEntry &entry : m_transaction->updates()) {
     Package *pkg = entry.first->package();
-    const Registry::QueryResult &regEntry = entry.second;
+    const Registry::Entry &regEntry = entry.second;
     const VersionSet &versions = pkg->versions();
 
     for(Version *ver : versions | boost::adaptors::reversed) {
diff --git a/src/transaction.cpp b/src/transaction.cpp
@@ -91,7 +91,7 @@ void Transaction::updateAll()
 {
   for(RemoteIndex *ri : m_remoteIndexes) {
     for(Package *pkg : ri->packages()) {
-      Registry::QueryResult entry = m_registry->query(pkg);
+      Registry::Entry entry = m_registry->query(pkg);
 
       Version *ver = pkg->lastVersion();
 
@@ -121,7 +121,7 @@ void Transaction::install()
 
   for(const PackageEntry &entry : m_packages) {
     Version *ver = entry.first;
-    const Registry::QueryResult regEntry = entry.second;
+    const Registry::Entry regEntry = entry.second;
 
     Task *task = new Task(this);
 
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -34,7 +34,7 @@ public:
   typedef boost::signals2::signal<void ()> Signal;
   typedef Signal::slot_type Callback;
 
-  typedef std::pair<Version *, const Registry::QueryResult> PackageEntry;
+  typedef std::pair<Version *, const Registry::Entry> PackageEntry;
   typedef std::vector<PackageEntry> PackageEntryList;
 
   struct Error {
diff --git a/test/registry.cpp b/test/registry.cpp
@@ -25,7 +25,7 @@ TEST_CASE("query uninstalled package", M) {
 
   Registry reg;
 
-  const Registry::QueryResult res = reg.query(&pkg);
+  const Registry::Entry res = reg.query(&pkg);
   REQUIRE(res.status == Registry::Uninstalled);
   REQUIRE(res.version == 0);
 }
@@ -36,7 +36,7 @@ TEST_CASE("query up to date pacakge", M) {
   Registry reg;
   reg.push(ver);
 
-  const Registry::QueryResult res = reg.query(&pkg);
+  const Registry::Entry res = reg.query(&pkg);
   REQUIRE(res.status == Registry::UpToDate);
   REQUIRE(res.version == Version("1.0").code());
 }
@@ -51,12 +51,12 @@ TEST_CASE("bump version", M) {
   reg.push(ver);
   pkg.addVersion(ver2);
 
-  const Registry::QueryResult res1 = reg.query(&pkg);
+  const Registry::Entry res1 = reg.query(&pkg);
   REQUIRE(res1.status == Registry::UpdateAvailable);
   REQUIRE(res1.version == Version("1.0").code());
 
   reg.push(ver2);
-  const Registry::QueryResult res2 = reg.query(&pkg);
+  const Registry::Entry res2 = reg.query(&pkg);
   REQUIRE(res2.status == Registry::UpToDate);
   REQUIRE(res2.version == Version("2.0").code());
 }
@@ -67,7 +67,7 @@ TEST_CASE("get file list", M) {
   Registry reg;
   reg.push(ver);
 
-  const Registry::QueryResult res = reg.query(&pkg);
+  const Registry::Entry res = reg.query(&pkg);
   const set<Path> files = reg.getFiles(res);
 
   REQUIRE(files == ver->files());