summaryrefslogtreecommitdiff
path: root/epgsearch.h
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger (at) gmx (dot) de>2008-01-09 22:37:59 +0100
committerChristian Wieninger <cwieninger (at) gmx (dot) de>2008-01-09 22:37:59 +0100
commit2fcbdbd22272aae4f30e0842a42e11e0ca1844a1 (patch)
treec03b5365b979c198938a616279f2dee8cc7b718f /epgsearch.h
parent6249ff002f9388fafd464b461658a1f56c13defc (diff)
downloadvdr-plugin-live-2fcbdbd22272aae4f30e0842a42e11e0ca1844a1.tar.gz
vdr-plugin-live-2fcbdbd22272aae4f30e0842a42e11e0ca1844a1.tar.bz2
- first try with favorites
Diffstat (limited to 'epgsearch.h')
-rw-r--r--epgsearch.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/epgsearch.h b/epgsearch.h
index 4519490..51c73cf 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -375,6 +375,7 @@ public:
iterator end() { return m_list.end(); }
const_iterator end() const { return m_list.end(); }
+ void merge(SearchResults& r) {m_list.merge(r.m_list); m_list.sort();}
static std::string AddQuery(std::string const& query);
static std::string PopQuery(std::string const& md5);
private: