From c0d10423ba61cd415d0833ac4bddbb90c7f6e7fc Mon Sep 17 00:00:00 2001 From: tastytea Date: Thu, 8 Aug 2019 15:19:42 +0200 Subject: [PATCH] Changed vector to list. --- include/export/adoc.hpp | 2 +- include/export/export.hpp | 12 ++++++------ include/search.hpp | 18 ++++++++++-------- include/sqlite.hpp | 4 +++- src/cli/main.cpp | 6 +++--- src/lib/export/adoc.cpp | 2 +- src/lib/export/export.cpp | 15 +++++++-------- src/lib/search.cpp | 16 +++++++++------- src/lib/sqlite.cpp | 4 ++-- 9 files changed, 42 insertions(+), 37 deletions(-) diff --git a/include/export/adoc.hpp b/include/export/adoc.hpp index 8e0a0bd..e6f5c13 100644 --- a/include/export/adoc.hpp +++ b/include/export/adoc.hpp @@ -44,7 +44,7 @@ namespace Export void print() const override; private: - using tagmap = std::map>; + using tagmap = std::map>; using replacemap = const std::map; //! Replace strings in text. diff --git a/include/export/export.hpp b/include/export/export.hpp index bf0634f..0d0cdd1 100644 --- a/include/export/export.hpp +++ b/include/export/export.hpp @@ -17,11 +17,11 @@ #ifndef REMWHAREAD_EXPORT_HPP #define REMWHAREAD_EXPORT_HPP -#include +#include #include #include "sqlite.hpp" -using std::vector; +using std::list; using std::ostream; using std::cout; @@ -45,7 +45,7 @@ namespace Export * @param entries Vector of Database::entry to export. * @param out Output stream. */ - explicit ExportBase(const vector &entries, + explicit ExportBase(const list &entries, ostream &out = cout); /*! @@ -54,7 +54,7 @@ namespace Export virtual void print() const = 0; protected: - const vector _entries; + const list _entries; ostream &_out; /*! @@ -64,8 +64,8 @@ namespace Export * * @return Sorted vector of Database::entry. */ - const vector - sort_entries(vector entries) const; + const list + sort_entries(list entries) const; }; } } diff --git a/include/search.hpp b/include/search.hpp index c89eeeb..1c34742 100644 --- a/include/search.hpp +++ b/include/search.hpp @@ -17,14 +17,16 @@ #ifndef REMWHAREAD_SEARCH_HPP #define REMWHAREAD_SEARCH_HPP -#include +#include #include +#include #include "sqlite.hpp" namespace remwharead { - using std::vector; + using std::list; using std::string; + using std::vector; /*! * @brief Search in database entries. @@ -41,7 +43,7 @@ namespace remwharead * * @since 0.7.0 */ - explicit Search(const vector &entries); + explicit Search(const list &entries); /*! * @brief Search in tags of database entries. @@ -55,8 +57,8 @@ namespace remwharead * * @since 0.7.0 */ - const vector search_tags(string expression, - const bool is_re) const; + const list search_tags(string expression, + const bool is_re) const; /*! * @brief Search in full text of database entries. @@ -71,11 +73,11 @@ namespace remwharead * * @since 0.7.0 */ - const vector search_all(string expression, - const bool is_re) const; + const list search_all(string expression, + const bool is_re) const; private: - const vector _entries; + const list _entries; /*! * @brief Split expression into subexpressions. diff --git a/include/sqlite.hpp b/include/sqlite.hpp index e91e59a..ea16e70 100644 --- a/include/sqlite.hpp +++ b/include/sqlite.hpp @@ -22,6 +22,7 @@ #include #include #include +#include #include namespace remwharead @@ -31,6 +32,7 @@ namespace remwharead using std::vector; using std::chrono::system_clock; using time_point = system_clock::time_point; + using std::list; using Poco::Data::Session; /*! @@ -102,7 +104,7 @@ namespace remwharead * * @since 0.6.0 */ - const vector retrieve( + const list retrieve( const time_point &start = time_point(), const time_point &end = system_clock::now()) const; diff --git a/src/cli/main.cpp b/src/cli/main.cpp index 43fd139..d26e3fd 100644 --- a/src/cli/main.cpp +++ b/src/cli/main.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "sqlite.hpp" #include "remwharead_cli.hpp" #include "uri.hpp" @@ -35,6 +36,7 @@ using std::endl; using std::string; using std::chrono::system_clock; using std::ofstream; +using std::list; int App::main(const std::vector &args) { @@ -108,9 +110,7 @@ int App::main(const std::vector &args) if (_format != export_format::undefined) { - vector entries = db.retrieve(_timespan[0], - _timespan[1]); - Search search(entries); + list entries = db.retrieve(_timespan[0], _timespan[1]); if (!_search_tags.empty()) { diff --git a/src/lib/export/adoc.cpp b/src/lib/export/adoc.cpp index 6e84085..317d8ea 100644 --- a/src/lib/export/adoc.cpp +++ b/src/lib/export/adoc.cpp @@ -31,7 +31,7 @@ namespace remwharead using std::endl; using std::regex; using std::regex_replace; - using tagpair = std::pair>; + using tagpair = std::pair>; void Export::AsciiDoc::print() const { diff --git a/src/lib/export/export.cpp b/src/lib/export/export.cpp index e2e195c..5d35b83 100644 --- a/src/lib/export/export.cpp +++ b/src/lib/export/export.cpp @@ -21,19 +21,18 @@ namespace remwharead { namespace Export { - ExportBase::ExportBase(const vector &entries, ostream &out) + ExportBase::ExportBase(const list &entries, ostream &out) : _entries(sort_entries(entries)) , _out(out) {} - const vector - ExportBase::sort_entries(vector entries) const + const list + ExportBase::sort_entries(list entries) const { - std::sort(entries.begin(), entries.end(), - [](const auto &a, const auto &b) - { - return (a.datetime > b.datetime); - }); + entries.sort([](const auto &a, const auto &b) + { + return (a.datetime > b.datetime); + }); return entries; } } diff --git a/src/lib/search.cpp b/src/lib/search.cpp index 31f6a3a..c1b5818 100644 --- a/src/lib/search.cpp +++ b/src/lib/search.cpp @@ -17,18 +17,20 @@ #include #include #include +#include #include #include "search.hpp" namespace remwharead { + using std::list; using std::regex; using std::regex_search; using std::smatch; using std::find; using std::find_if; - Search::Search(const vector &entries) + Search::Search(const list &entries) :_entries(entries) {} @@ -72,11 +74,11 @@ namespace remwharead return Poco::UTF8::toLower(str); } - const vector Search::search_tags(string expression, - const bool is_re) const + const list Search::search_tags(string expression, + const bool is_re) const { vector> searchlist = parse_expression(expression); - vector result; + list result; for (const vector &tags_or : searchlist) { @@ -116,11 +118,11 @@ namespace remwharead return result; } - const vector Search::search_all(string expression, - const bool is_re) const + const list Search::search_all(string expression, + const bool is_re) const { vector> searchlist = parse_expression(expression); - vector result = search_tags(expression, is_re); + list result = search_tags(expression, is_re); for (const vector &terms_or : searchlist) { diff --git a/src/lib/sqlite.cpp b/src/lib/sqlite.cpp index 765b452..efb1be5 100644 --- a/src/lib/sqlite.cpp +++ b/src/lib/sqlite.cpp @@ -112,7 +112,7 @@ namespace remwharead } } - const vector Database::retrieve( + const list Database::retrieve( const time_point &start, const time_point &end) const { try @@ -130,7 +130,7 @@ namespace remwharead into(strtags), into(entrybuf.title), into(entrybuf.description), into(entrybuf.fulltext), range(0, 1); - vector entries; + list entries; while(!select.done()) {