commit c8cc1d662b0840efba9db7c875a803b06ee43b8b
parent 0ae67ba02d2f2cdba713889f6c2688825e4c8a94
Author: cfillion <cfillion@users.noreply.github.com>
Date: Wed, 24 Aug 2016 01:58:04 -0400
refactoring – remove many typedefs
Diffstat:
9 files changed, 38 insertions(+), 55 deletions(-)
diff --git a/src/dialog.cpp b/src/dialog.cpp
@@ -31,7 +31,7 @@
using namespace std;
-DialogMap Dialog::s_instances;
+std::map<HWND, Dialog *> Dialog::s_instances;
WDL_DLGRET Dialog::Proc(HWND handle, UINT msg, WPARAM wParam, LPARAM lParam)
{
@@ -187,7 +187,7 @@ void Dialog::Destroy(Dialog *dlg)
void Dialog::DestroyAll()
{
- const DialogMap map = s_instances; // make an immutable copy
+ const auto map = s_instances; // make an immutable copy
for(Dialog *dlg : map | boost::adaptors::map_values)
Destroy(dlg);
}
diff --git a/src/dialog.hpp b/src/dialog.hpp
@@ -29,9 +29,6 @@
#include <wdltypes.h>
#include <wingui/wndsize.h>
-class Dialog;
-typedef std::map<HWND, Dialog *> DialogMap;
-
class Control;
class Dialog {
@@ -153,7 +150,7 @@ protected:
private:
static WDL_DLGRET Proc(HWND, UINT, WPARAM, LPARAM);
static int HandleKey(MSG *, accelerator_register_t *);
- static DialogMap s_instances;
+ static std::map<HWND, Dialog *> s_instances;
const int m_template;
bool m_isVisible;
diff --git a/src/index.hpp b/src/index.hpp
@@ -28,9 +28,6 @@
#include "package.hpp"
#include "source.hpp"
-class Category;
-typedef std::vector<const Category *> CategoryList;
-
class Download;
class Index;
class Path;
@@ -56,20 +53,20 @@ public:
const Metadata *metadata() const { return &m_metadata; }
bool addCategory(const Category *cat);
- const CategoryList &categories() const { return m_categories; }
+ const auto &categories() const { return m_categories; }
const Category *category(size_t i) const { return m_categories[i]; }
const Category *category(const std::string &name) const;
const Package *find(const std::string &cat, const std::string &pkg) const;
- const PackageList &packages() const { return m_packages; }
+ const std::vector<const Package *> &packages() const { return m_packages; }
private:
static void loadV1(TiXmlElement *, Index *);
std::string m_name;
Metadata m_metadata;
- CategoryList m_categories;
- PackageList m_packages;
+ std::vector<const Category *> m_categories;
+ std::vector<const Package *> m_packages;
std::unordered_map<std::string, size_t> m_catMap;
};
@@ -84,7 +81,7 @@ public:
std::string fullName() const;
bool addPackage(const Package *pack);
- const PackageList &packages() const { return m_packages; }
+ const auto &packages() const { return m_packages; }
const Package *package(size_t i) const { return m_packages[i]; }
const Package *package(const std::string &name) const;
@@ -92,8 +89,7 @@ private:
const Index *m_index;
std::string m_name;
- PackageList m_packages;
-
+ std::vector<const Package *> m_packages;
std::unordered_map<std::string, size_t> m_pkgMap;
};
diff --git a/src/metadata.hpp b/src/metadata.hpp
@@ -32,18 +32,16 @@ public:
DonationLink,
};
- typedef std::multimap<LinkType, Link> LinkMap;
-
static LinkType getLinkType(const char *rel);
void setAbout(const std::string &rtf) { m_about = rtf; }
const std::string &about() const { return m_about; }
void addLink(const LinkType, const Link &);
- const LinkMap &links() const { return m_links; }
+ const auto &links() const { return m_links; }
private:
std::string m_about;
- LinkMap m_links;
+ std::multimap<LinkType, Link> m_links;
};
#endif
diff --git a/src/package.hpp b/src/package.hpp
@@ -57,21 +57,28 @@ public:
const Metadata *metadata() const { return &m_metadata; }
bool addVersion(const Version *ver);
- const VersionSet &versions() const { return m_versions; }
+ const auto &versions() const { return m_versions; }
const Version *version(size_t index) const;
const Version *lastVersion(bool pres = true, const Version &from = {}) const;
const Version *findVersion(const Version &) const;
private:
+ class CompareVersion {
+ public:
+ bool operator()(const Version *l, const Version *r) const
+ {
+ return *l < *r;
+ }
+ };
+
const Category *m_category;
Type m_type;
std::string m_name;
std::string m_desc;
Metadata m_metadata;
- VersionSet m_versions;
-};
+ std::set<const Version *, CompareVersion> m_versions;
-typedef std::vector<const Package *> PackageList;
+};
#endif
diff --git a/src/report.cpp b/src/report.cpp
@@ -111,7 +111,7 @@ void Report::printUpdates()
for(const InstallTicket &ticket : m_receipt.updates()) {
const Package *pkg = ticket.version->package();
- const VersionSet &versions = pkg->versions();
+ const auto &versions = pkg->versions();
if(m_stream.tellp() != start)
m_stream << "\r\n";
diff --git a/src/task.hpp b/src/task.hpp
@@ -21,7 +21,6 @@
#include "path.hpp"
#include "registry.hpp"
-#include <queue>
#include <set>
#include <vector>
@@ -100,16 +99,4 @@ private:
bool m_pin;
};
-typedef std::shared_ptr<Task> TaskPtr;
-
-class CompareTaskPtr {
-public:
- bool operator()(const TaskPtr &l, const TaskPtr &r) const
- {
- return *l < *r;
- }
-};
-
-typedef std::priority_queue<TaskPtr, std::vector<TaskPtr>, CompareTaskPtr> TaskQueue;
-
#endif
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -33,9 +33,10 @@
class Config;
class Path;
class Remote;
-class Task;
struct InstallOpts;
+typedef std::shared_ptr<Task> TaskPtr;
+
struct HostTicket { bool add; Registry::Entry entry; Registry::File file; };
class Transaction {
@@ -69,6 +70,17 @@ public:
bool saveFile(Download *, const Path &);
private:
+ class CompareTask {
+ public:
+ bool operator()(const TaskPtr &l, const TaskPtr &r) const
+ {
+ return *l < *r;
+ }
+ };
+
+ typedef std::priority_queue<TaskPtr,
+ std::vector<TaskPtr>, CompareTask> TaskQueue;
+
void fetchIndex(const Remote &, const std::function<void ()> &);
void synchronize(const Package *, const InstallOpts &);
bool allFilesExists(const std::set<Path> &) const;
diff --git a/src/version.hpp b/src/version.hpp
@@ -33,8 +33,6 @@ class Path;
class Version {
public:
- typedef std::vector<const Source *> SourceList;
-
Version();
Version(const std::string &, const Package * = nullptr);
Version(const Version &, const Package * = nullptr);
@@ -61,7 +59,7 @@ public:
const std::string &changelog() const { return m_changelog; }
bool addSource(const Source *source);
- const SourceList &sources() const { return m_sources; }
+ const auto &sources() const { return m_sources; }
const Source *source(size_t i) const { return m_sources[i]; }
const std::set<Path> &files() const { return m_files; }
@@ -87,21 +85,9 @@ private:
std::string m_author;
std::string m_changelog;
Time m_time;
-
const Package *m_package;
-
- SourceList m_sources;
+ std::vector<const Source *> m_sources;
std::set<Path> m_files;
};
-class CompareVersionPtr {
-public:
- bool operator()(const Version *l, const Version *r) const
- {
- return *l < *r;
- }
-};
-
-typedef std::set<const Version *, CompareVersionPtr> VersionSet;
-
#endif
