diff --git a/recmanager.c b/recmanager.c index b409c5c..0a5fc75 100644 --- a/recmanager.c +++ b/recmanager.c @@ -591,9 +591,9 @@ void cRecManager::DeleteSearchTimer(cTVGuideSearchTimer *searchTimer, bool delTi if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) { bool success = epgSearch->handler->DelSearchTimer(searchTimerID); if (success) { - esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->SearchString().c_str()); + esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->GetSearchString().c_str()); } else { - esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->SearchString().c_str()); + esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->GetSearchString().c_str()); } } } diff --git a/recmenuitem.c b/recmenuitem.c index 058ce5d..9017067 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -2693,10 +2693,10 @@ void cRecMenuItemSearchTimer::SetPixmaps(void) { void cRecMenuItemSearchTimer::Draw(void) { int textX = DrawIcons(); - bool timerIsActive = timer.Active(); + bool timerIsActive = timer.IsActive(); pixmapText->Fill(clrTransparent); textX += 20; - cString label = cString::sprintf("\"%s\"", timer.SearchString().c_str()); + cString label = cString::sprintf("\"%s\"", timer.GetSearchString().c_str()); cString inactive = cString::sprintf("(%s)", tr("inactive")); int numTimersActive = timer.GetNumTimers(); int numRecordings = timer.GetNumRecordings(); @@ -2822,7 +2822,7 @@ void cRecMenuItemFavorite::Draw(void) { int textX = DrawIcons(); pixmapText->Fill(clrTransparent); textX += 20; - cString label = cString::sprintf("\"%s\"", favorite.SearchString().c_str()); + cString label = cString::sprintf("\"%s\"", favorite.GetSearchString().c_str()); pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge); } diff --git a/recmenumanager.c b/recmenumanager.c index bb5546a..9db1ce4 100644 --- a/recmenumanager.c +++ b/recmenumanager.c @@ -367,12 +367,12 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { if (numSearchResults) { activeMenuBuffer = activeMenu; activeMenuBuffer->Hide(); - activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", recState); + activeMenu = new cRecMenuSearchTimerResults(searchTimer.GetSearchString(), searchResult, numSearchResults, "", recState); activeMenu->Display(); } else { activeMenuBuffer = activeMenu; activeMenuBuffer->Hide(); - activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.SearchString()); + activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.GetSearchString()); activeMenu->Display(); } break; } diff --git a/recmenus.c b/recmenus.c index d99e3f6..0f645a5 100644 --- a/recmenus.c +++ b/recmenus.c @@ -632,7 +632,7 @@ cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer s this->templates = templates; SetWidthPercent(70); cString message = tr("Configure Search Timer for Search String"); - cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.SearchString().c_str()); + cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.GetSearchString().c_str()); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); infoItem->CalculateHeight(width - 2 * border); SetHeader(infoItem); @@ -727,8 +727,8 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer this->advancedOptions = advancedOptions; this->searchTimer = searchTimer; this->channelGroups = channelGroups; - strncpy(searchString, searchTimer.SearchString().c_str(), TEXTINPUTLENGTH); - timerActive = searchTimer.Active(); + strncpy(searchString, searchTimer.GetSearchString().c_str(), TEXTINPUTLENGTH); + timerActive = searchTimer.IsActive(); mode = searchTimer.SearchMode(); useTitle = searchTimer.UseTitle(); useSubtitle = searchTimer.UseSubtitle(); @@ -1001,7 +1001,7 @@ cRecMenuSearchTimerDeleteConfirm::cRecMenuSearchTimerDeleteConfirm(cTVGuideSearc this->searchTimer = searchTimer; SetWidthPercent(70); cString message = tr("Really delete Search Timer"); - cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.SearchString().c_str()); + cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.GetSearchString().c_str()); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); infoItem->CalculateHeight(width - 2 * border); SetHeader(infoItem); @@ -1051,7 +1051,7 @@ cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEP cString message2 = tr("Search Term"); cString message3 = tr("Using Template"); - cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.SearchString().c_str(), *message3, templ.name.c_str()); + cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.GetSearchString().c_str(), *message3, templ.name.c_str()); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText); infoItem->CalculateHeight(width - 2 * border); AddMenuItem(infoItem); diff --git a/searchtimer.c b/searchtimer.c index a7b7141..e56ad05 100644 --- a/searchtimer.c +++ b/searchtimer.c @@ -78,7 +78,7 @@ cTVGuideSearchTimer::~cTVGuideSearchTimer(void) { } bool cTVGuideSearchTimer::operator < (const cTVGuideSearchTimer& other) const { - std::string searchStringOther = other.SearchString(); + std::string searchStringOther = other.GetSearchString(); searchStringOther = StrToLowerCase(searchStringOther); std::string thisSearchString = StrToLowerCase(searchString); int comp = thisSearchString.compare(searchStringOther); @@ -520,7 +520,7 @@ std::string cTVGuideSearchTimer::BuildSearchString(void) { return strTimer; } -bool cTVGuideSearchTimer::Active(void) { +bool cTVGuideSearchTimer::IsActive(void) { if (useAsSearchTimer) return true; return false; diff --git a/searchtimer.h b/searchtimer.h index 5a1373f..2638e83 100644 --- a/searchtimer.h +++ b/searchtimer.h @@ -76,8 +76,8 @@ public: std::string BuildSearchString(void); int GetID(void) { return ID; }; //GETTER - std::string SearchString(void) const { return searchString; }; - bool Active(void); + std::string GetSearchString(void) const { return searchString; }; + bool IsActive(void); bool UseTitle(void) { return useTitle; }; bool UseSubtitle(void) { return useSubtitle; }; bool UseDescription(void) { return useDescription; };