summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-06-17 14:29:42 +0200
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-06-17 14:39:11 +0200
commit507ecc60f661d9dbba0c1f582329b20e840106e7 (patch)
tree0a5286e2f8949a4fe6e0d77b96a0c8b367a09530
parentef4ff3d115a1053ecea7bcfafac4f46f34ddf1d1 (diff)
downloadvdr-plugin-tvguide-507ecc60f661d9dbba0c1f582329b20e840106e7.tar.gz
vdr-plugin-tvguide-507ecc60f661d9dbba0c1f582329b20e840106e7.tar.bz2
Eliminate all currentMenuItems
-rw-r--r--recmenus.c5
-rw-r--r--recmenus.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/recmenus.c b/recmenus.c
index 4767a3f..21949bc 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -759,7 +759,6 @@ cRecMenuSearchTimerEdit::~cRecMenuSearchTimerEdit(void) {
delete *it;
}
mainMenuItems.clear();
- currentMenuItems.clear();
}
int cRecMenuSearchTimerEdit::SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups) {
@@ -852,7 +851,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
int start = GetStartIndex();
for (int i = start; i < numMenuItems; i++) {
- if (!AddMenuItemInitial(currentMenuItems[i])) {
+ if (!AddMenuItemInitial(mainMenuItems[i])) {
break;
}
}
@@ -923,7 +922,7 @@ int cRecMenuSearchTimerEdit::GetTotalNumMenuItems(void) {
cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) {
if ((number > -1) && (number < numMenuItems)) {
- return currentMenuItems[number];
+ return mainMenuItems[number];
}
return NULL;
}
diff --git a/recmenus.h b/recmenus.h
index d4e2b49..84c756f 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -217,7 +217,6 @@ private:
std::vector<std::string> delModes;
std::vector<std::string> channelgroups;
std::vector<cRecMenuItem*> mainMenuItems;
- std::vector<cRecMenuItem*> currentMenuItems;
bool init;
int numMenuItems;
int useChannelPos;