[cleanup] [ios] Fixed unidiomatic accessor naming.

This commit is contained in:
Ilya Grechuhin 2017-01-10 16:13:27 +03:00
parent 08a1048498
commit dcf987c228
6 changed files with 18 additions and 18 deletions

View file

@ -5,7 +5,7 @@
@protocol MWMCuisineEditorProtocol <NSObject>
- (vector<string>)getSelectedCuisines;
- (vector<string>)selectedCuisines;
- (void)setSelectedCuisines:(vector<string> const &)cuisines;
@end

View file

@ -153,7 +153,7 @@ vector<string> SliceKeys(vector<pair<string, string>> const & v)
using namespace osm;
m_allCuisines = Cuisines::Instance().AllSupportedCuisines();
m_displayedKeys = SliceKeys(m_allCuisines);
m_selectedCuisines = [self.delegate getSelectedCuisines];
m_selectedCuisines = [self.delegate selectedCuisines];
for (auto const & s : m_selectedCuisines)
{
string const translated = Cuisines::Instance().Translate(s);

View file

@ -1041,7 +1041,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
#pragma mark - MWMCuisineEditorProtocol
- (vector<string>)getSelectedCuisines { return m_mapObject.GetCuisines(); }
- (vector<string>)selectedCuisines { return m_mapObject.GetCuisines(); }
- (void)setSelectedCuisines:(vector<string> const &)cuisines { m_mapObject.SetCuisines(cuisines); }
#pragma mark - MWMStreetEditorProtocol

View file

@ -89,7 +89,7 @@ using namespace osmoh;
}
}
- (ui::TTimeTableProxy)getTimeTableProxy:(NSUInteger)index
- (ui::TTimeTableProxy)timeTableProxy:(NSUInteger)index
{
NSAssert(index < self.count, @"Invalid section index");
return timeTableSet.Get(index);

View file

@ -10,7 +10,7 @@
- (void)updateActiveSection:(NSUInteger)index;
- (editor::ui::TTimeTableProxy)getTimeTableProxy:(NSUInteger)index;
- (editor::ui::TTimeTableProxy)timeTableProxy:(NSUInteger)index;
- (void)deleteSchedule:(NSUInteger)index;
@end

View file

@ -114,7 +114,7 @@ using namespace osmoh;
return cachedTime;
BOOL const isClosed = [self cellKeyForRow:row] != MWMOpeningHoursEditorTimeSpanCell;
TTimeTableProxy tt = [self getTimeTableProxy];
TTimeTableProxy tt = [self timeTableProxy];
NSUInteger const index = isClosed ? [self closedTimeIndex:row] : 0;
Timespan span = isClosed ? tt.GetExcludeTime()[index] : tt.GetOpeningTime();
return dateComponentsFromTime(isStart ? span.GetStart() : span.GetEnd());
@ -125,7 +125,7 @@ using namespace osmoh;
if (!startTime && !endTime)
return;
TTimeTableProxy tt = [self getTimeTableProxy];
TTimeTableProxy tt = [self timeTableProxy];
NSUInteger const row = self.selectedRow.unsignedIntegerValue;
NSUInteger const index = isClosed ? [self closedTimeIndex:row] : 0;
Timespan span = isClosed ? tt.GetExcludeTime()[index] : tt.GetOpeningTime();
@ -165,7 +165,7 @@ using namespace osmoh;
- (NSUInteger)closedTimesCount
{
return [self getTimeTableProxy].GetExcludeTime().size();
return [self timeTableProxy].GetExcludeTime().size();
}
- (NSUInteger)closedTimeIndex:(NSUInteger)row
@ -185,7 +185,7 @@ using namespace osmoh;
NSUInteger const row = [self firstRowForKey:MWMOpeningHoursEditorAddClosedCell];
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
NSUInteger const closedTimesCountBeforeUpdate = [self closedTimesCount];
@ -222,7 +222,7 @@ using namespace osmoh;
UITableView * tableView = self.delegate.tableView;
[tableView beginUpdates];
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
timeTable.RemoveExcludeTime([self closedTimeIndex:row]);
timeTable.Commit();
@ -237,7 +237,7 @@ using namespace osmoh;
- (void)addSelectedDay:(Weekday)day
{
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
TOpeningDays openingDays(timeTable.GetOpeningDays());
openingDays.insert(day);
timeTable.SetOpeningDays(openingDays);
@ -247,7 +247,7 @@ using namespace osmoh;
- (void)removeSelectedDay:(Weekday)day
{
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
TOpeningDays openingDays(timeTable.GetOpeningDays());
openingDays.erase(day);
timeTable.SetOpeningDays(openingDays);
@ -257,7 +257,7 @@ using namespace osmoh;
- (BOOL)containsSelectedDay:(Weekday)day
{
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
TOpeningDays const & openingDays = timeTable.GetOpeningDays();
return openingDays.find(day) != openingDays.end();
}
@ -316,9 +316,9 @@ using namespace osmoh;
#pragma mark - Model
- (TTimeTableProxy)getTimeTableProxy
- (TTimeTableProxy)timeTableProxy
{
return [self.delegate getTimeTableProxy:self.index];
return [self.delegate timeTableProxy:self.index];
}
- (void)deleteSchedule
@ -444,7 +444,7 @@ using namespace osmoh;
- (BOOL)allDay
{
return [self getTimeTableProxy].IsTwentyFourHours();
return [self timeTableProxy].IsTwentyFourHours();
}
- (void)setAllDay:(BOOL)allDay
@ -456,7 +456,7 @@ using namespace osmoh;
NSUInteger const deleteScheduleCellShift = self.index != 0 ? 1 : 0;
NSUInteger const oldRowCount = [self numberOfRowsForAllDay:currentAllDay] - deleteScheduleCellShift;
NSUInteger const newRowCount = [self numberOfRowsForAllDay:allDay] - deleteScheduleCellShift;
TTimeTableProxy timeTable = [self getTimeTableProxy];
TTimeTableProxy timeTable = [self timeTableProxy];
timeTable.SetTwentyFourHours(allDay);
timeTable.Commit();
[self refreshForNewRowCount:newRowCount oldRowCount:oldRowCount];
@ -484,7 +484,7 @@ using namespace osmoh;
- (BOOL)canAddClosedTime
{
return [self getTimeTableProxy].CanAddExcludeTime();
return [self timeTableProxy].CanAddExcludeTime();
}
@end