Merge pull request #5061 from igrechuhin/cleanup

[cleanup] [ios] Project structure cleanup.
2016-12-19 18:50:56 +03:00 · 2016-12-19 18:50:56 +03:00 · 770336e8ae
commit 770336e8ae
parent ebfa9db60d 58f24ae5f2
229 changed files with 1594 additions and 1573 deletions
--- a/iphone/Maps/Categories/UIViewController+Navigation.h
+++ b/iphone/Maps/Categories/UIViewController+Navigation.h
--- a/iphone/Maps/Categories/UIViewController+Navigation.mm
+++ b/iphone/Maps/Categories/UIViewController+Navigation.mm
@ -1,4 +1,4 @@
-#import "Common.h"
+#import "MWMCommon.h"
 #import "UIButton+Orientation.h"
 #import "UIViewController+Navigation.h"

--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderAdsTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderButtonTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderCellHeader.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderCellHeader.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderCellHeader.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderCellHeader.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.h
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.xib
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.xib
--- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCellProtocol.h
+++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCellProtocol.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.h
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.mm
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.h
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.mm
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.h
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.mm
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.h
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.h
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.h
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
--- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.h
+++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.h
--- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
+++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
--- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderProtocol.h
+++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderProtocol.h
--- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderTypes.h
+++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderTypes.h
--- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.h
+++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.h
--- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
+++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
--- a/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.h
+++ b/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.h
--- a/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.mm
+++ b/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.mm
--- a/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsViewController.h
+++ b/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsViewController.h
--- a/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsViewController.mm
+++ b/iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsViewController.mm
--- a/iphone/Maps/Classes/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
+++ b/iphone/Maps/Classes/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
--- a/iphone/Maps/Classes/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
+++ b/iphone/Maps/Classes/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
--- a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h
--- a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.mm
+++ b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.mm
--- a/iphone/Maps/Classes/Editor/MWMButtonCell.h
+++ b/iphone/Maps/Classes/Editor/MWMButtonCell.h
--- a/iphone/Maps/Classes/Editor/MWMButtonCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMButtonCell.mm
--- a/iphone/Maps/Classes/Editor/MWMButtonCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMButtonCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorAddAdditionalNameTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamePlaceholderTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamePlaceholderTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNameTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.h
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorAdditionalNamesHeader.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorCategoryCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorCommon.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorCommon.h
--- a/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.h
--- a/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorNotesFooter.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorSwitchTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.h
--- a/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMEditorTextTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/MWMEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.h
--- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
--- a/iphone/Maps/Classes/Editor/MWMNoteCell.h
+++ b/iphone/Maps/Classes/Editor/MWMNoteCell.h
--- a/iphone/Maps/Classes/Editor/MWMNoteCell.mm
+++ b/iphone/Maps/Classes/Editor/MWMNoteCell.mm
--- a/iphone/Maps/Classes/Editor/MWMNoteCell.xib
+++ b/iphone/Maps/Classes/Editor/MWMNoteCell.xib
--- a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.h
+++ b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.h
--- a/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
+++ b/iphone/Maps/Classes/Editor/MWMObjectsCategorySelectorController.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.h
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.h
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.h
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.h
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.h
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.h
--- a/Show more
+++ b/Show more