mirror of
https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
synced 2023-10-05 15:01:48 +02:00
Rename isActive() to IsActive()
This commit is contained in:
parent
018a8946b7
commit
6174461af6
14
recmenu.c
14
recmenu.c
@ -197,7 +197,7 @@ void cRecMenu::Activate(cRecMenuItem *itemOld, cRecMenuItem *item) {
|
||||
|
||||
bool cRecMenu::ActivatePrev(void) {
|
||||
cRecMenuItem *activeItem = GetActiveMenuItem();
|
||||
if (!scrollable && footer && footer->isActive()) {
|
||||
if (!scrollable && footer && footer->IsActive()) {
|
||||
if (menuItems.size() > 0) {
|
||||
cRecMenuItem *itemLast = menuItems.back();
|
||||
Activate(footer, itemLast);
|
||||
@ -228,7 +228,7 @@ bool cRecMenu::ActivatePrev(void) {
|
||||
}
|
||||
|
||||
bool cRecMenu::ScrollUp(void) {
|
||||
if (footer && footer->isActive()) {
|
||||
if (footer && footer->IsActive()) {
|
||||
if (menuItems.size() > 0)
|
||||
Activate(footer, menuItems.back());
|
||||
} else {
|
||||
@ -286,7 +286,7 @@ bool cRecMenu::ActivateNext(void) {
|
||||
if (next) {
|
||||
Activate(activeItem , next);
|
||||
return true;
|
||||
} else if (!scrollable && footer && footer->isSelectable() && !footer->isActive()) {
|
||||
} else if (!scrollable && footer && footer->isSelectable() && !footer->IsActive()) {
|
||||
Activate(activeItem , footer);
|
||||
return true;
|
||||
}
|
||||
@ -324,7 +324,7 @@ bool cRecMenu::ScrollDown(void) {
|
||||
ActivateNext();
|
||||
} else {
|
||||
//last item reached, activate footer if not already active
|
||||
if ((footer) && !(footer->isActive())) {
|
||||
if ((footer) && !(footer->IsActive())) {
|
||||
cRecMenuItem *activeItem = GetActiveMenuItem();
|
||||
Activate(activeItem , footer);
|
||||
} else {
|
||||
@ -618,10 +618,10 @@ void cRecMenu::DrawScrollBar(void) {
|
||||
|
||||
cRecMenuItem *cRecMenu::GetActiveMenuItem(void) {
|
||||
for (std::list<cRecMenuItem*>::iterator item = menuItems.begin(); item != menuItems.end(); item++) {
|
||||
if ((*item)->isActive())
|
||||
if ((*item)->IsActive())
|
||||
return *item;
|
||||
}
|
||||
if (footer && footer->isActive())
|
||||
if (footer && footer->IsActive())
|
||||
return footer;
|
||||
return NULL;
|
||||
}
|
||||
@ -639,7 +639,7 @@ cRecMenuItem *cRecMenu::GetMenuItemAt(int num) {
|
||||
int cRecMenu::GetNumActive(void) {
|
||||
int numActive = startIndex;
|
||||
for (std::list<cRecMenuItem*>::iterator item = menuItems.begin(); item != menuItems.end(); item++) {
|
||||
if ((*item)->isActive()) {
|
||||
if ((*item)->IsActive()) {
|
||||
break;
|
||||
}
|
||||
numActive++;
|
||||
|
@ -113,7 +113,7 @@ public:
|
||||
virtual void setActive(void) { this->active = true; }
|
||||
virtual void setInactive(void) { this->active = false; }
|
||||
bool isSelectable(void) { return selectable; }
|
||||
bool isActive(void) { return active; }
|
||||
bool IsActive(void) { return active; }
|
||||
virtual void setBackground(void);
|
||||
virtual void Draw(void) {};
|
||||
virtual void Hide(void) { if (pixmap) pixmap->SetLayer(-1);};
|
||||
|
@ -797,7 +797,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
|
||||
|
||||
if (mainMenuItems.size() > 0) {
|
||||
for (long unsigned int index = 0; index < mainMenuItems.size(); index++) {
|
||||
if (mainMenuItems[index]->isActive()) {
|
||||
if (mainMenuItems[index]->IsActive()) {
|
||||
activeMenuItem = index;
|
||||
break;
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ public:
|
||||
cRecMenuView(void);
|
||||
virtual ~cRecMenuView(void);
|
||||
void SetFooter(cFooter *footer) { this->footer = footer; };
|
||||
bool isActive(void) { return active; };
|
||||
bool IsActive(void) { return active; };
|
||||
void Start(const cEvent *event);
|
||||
void StartFavorites(void);
|
||||
void Close(void);
|
||||
|
@ -728,7 +728,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
|
||||
eOSState state = osContinue;
|
||||
cPixmap::Lock();
|
||||
bool alreadyUnlocked = false;
|
||||
if (recMenuView->isActive()) {
|
||||
if (recMenuView->IsActive()) {
|
||||
state = recMenuView->ProcessKey(Key);
|
||||
if (state == osEnd) {
|
||||
SetTimers();
|
||||
|
Loading…
Reference in New Issue
Block a user