From 31ab94965942de088e99a811880bda4a770bee45 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Tue, 25 Aug 2015 16:36:44 +0300 Subject: [PATCH] Rename files --- generator/osm2type.cpp | 2 +- generator/{xml_element.cpp => osm_element.cpp} | 2 +- generator/{xml_element.hpp => osm_element.hpp} | 1 - generator/osm_source.cpp | 2 +- generator/osm_source.hpp | 2 +- generator/osm_translator.hpp | 2 +- generator/osm_xml_source.hpp | 2 +- .../generator.xcodeproj/project.pbxproj | 16 ++++++++-------- 8 files changed, 14 insertions(+), 15 deletions(-) rename generator/{xml_element.cpp => osm_element.cpp} (98%) rename generator/{xml_element.hpp => osm_element.hpp} (99%) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index f7a2668a58..158bb1d366 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -1,6 +1,6 @@ #include "generator/osm2type.hpp" #include "generator/osm2meta.hpp" -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" #include "indexer/classificator.hpp" #include "indexer/feature_visibility.hpp" diff --git a/generator/xml_element.cpp b/generator/osm_element.cpp similarity index 98% rename from generator/xml_element.cpp rename to generator/osm_element.cpp index e8ef8a9137..574fadb29d 100644 --- a/generator/xml_element.cpp +++ b/generator/osm_element.cpp @@ -1,4 +1,4 @@ -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" #include "coding/parse_xml.hpp" diff --git a/generator/xml_element.hpp b/generator/osm_element.hpp similarity index 99% rename from generator/xml_element.hpp rename to generator/osm_element.hpp index 6a47981e55..fe79bb318f 100644 --- a/generator/xml_element.hpp +++ b/generator/osm_element.hpp @@ -132,4 +132,3 @@ struct XMLElement }; string DebugPrint(XMLElement const & e); - diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 099bc3dd10..4a8304447a 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -8,7 +8,7 @@ #include "generator/osm_source.hpp" #include "generator/polygonizer.hpp" #include "generator/world_map_generator.hpp" -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" #include "indexer/classificator.hpp" #include "indexer/mercator.hpp" diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp index e3b5b07894..5fd7494de5 100644 --- a/generator/osm_source.hpp +++ b/generator/osm_source.hpp @@ -1,7 +1,7 @@ #pragma once #include "generator/generate_info.hpp" -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" #include "std/function.hpp" #include "std/iostream.hpp" diff --git a/generator/osm_translator.hpp b/generator/osm_translator.hpp index 70cc981a67..fd003289ff 100644 --- a/generator/osm_translator.hpp +++ b/generator/osm_translator.hpp @@ -1,7 +1,7 @@ #pragma once #include "generator/osm2type.hpp" -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" #include "generator/feature_builder.hpp" #include "generator/ways_merger.hpp" diff --git a/generator/osm_xml_source.hpp b/generator/osm_xml_source.hpp index df4494500d..04a4995b4c 100644 --- a/generator/osm_xml_source.hpp +++ b/generator/osm_xml_source.hpp @@ -8,7 +8,7 @@ #pragma once -#include "generator/xml_element.hpp" +#include "generator/osm_element.hpp" class XMLSource { diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 5e435d6b64..3df4fe9e5e 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -52,8 +52,8 @@ 6753408A1A3F2A7400A0A8C3 /* update_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340571A3F2A7400A0A8C3 /* update_generator.hpp */; }; 6753408B1A3F2A7400A0A8C3 /* ways_merger.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */; }; 6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */; }; - 6753408D1A3F2A7400A0A8C3 /* xml_element.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753405A1A3F2A7400A0A8C3 /* xml_element.cpp */; }; - 6753408E1A3F2A7400A0A8C3 /* xml_element.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753405B1A3F2A7400A0A8C3 /* xml_element.hpp */; }; + 6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */; }; + 6753408E1A3F2A7400A0A8C3 /* osm_element.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -104,8 +104,8 @@ 675340571A3F2A7400A0A8C3 /* update_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = update_generator.hpp; sourceTree = ""; }; 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ways_merger.hpp; sourceTree = ""; }; 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = world_map_generator.hpp; sourceTree = ""; }; - 6753405A1A3F2A7400A0A8C3 /* xml_element.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_element.cpp; sourceTree = ""; }; - 6753405B1A3F2A7400A0A8C3 /* xml_element.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = xml_element.hpp; sourceTree = ""; }; + 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_element.cpp; sourceTree = ""; }; + 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_element.hpp; sourceTree = ""; }; 6764B8921ADD6A3300DD8B15 /* osm_o5m_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_o5m_source.hpp; sourceTree = ""; }; 67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_xml_source.hpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -184,8 +184,8 @@ 675340571A3F2A7400A0A8C3 /* update_generator.hpp */, 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */, 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */, - 6753405A1A3F2A7400A0A8C3 /* xml_element.cpp */, - 6753405B1A3F2A7400A0A8C3 /* xml_element.hpp */, + 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */, + 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */, 670B84BA1A8CDB0000CE4492 /* osm_source.cpp */, 670B84BB1A8CDB0000CE4492 /* osm_source.hpp */, 6764B8921ADD6A3300DD8B15 /* osm_o5m_source.hpp */, @@ -212,7 +212,7 @@ 675340781A3F2A7400A0A8C3 /* intermediate_elements.hpp in Headers */, 6753406B1A3F2A7400A0A8C3 /* feature_emitter_iface.hpp in Headers */, 6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */, - 6753408E1A3F2A7400A0A8C3 /* xml_element.hpp in Headers */, + 6753408E1A3F2A7400A0A8C3 /* osm_element.hpp in Headers */, 6753406F1A3F2A7400A0A8C3 /* feature_merger.hpp in Headers */, 6753406A1A3F2A7400A0A8C3 /* feature_builder.hpp in Headers */, 675340741A3F2A7400A0A8C3 /* generate_info.hpp in Headers */, @@ -298,7 +298,7 @@ 675340621A3F2A7400A0A8C3 /* coastlines_generator.cpp in Sources */, 675340811A3F2A7400A0A8C3 /* routing_generator.cpp in Sources */, 6753406E1A3F2A7400A0A8C3 /* feature_merger.cpp in Sources */, - 6753408D1A3F2A7400A0A8C3 /* xml_element.cpp in Sources */, + 6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */, 6726C1D51A4AFEF4005EEA39 /* osm2meta.cpp in Sources */, 6753405E1A3F2A7400A0A8C3 /* borders_loader.cpp in Sources */, 675340691A3F2A7400A0A8C3 /* feature_builder.cpp in Sources */,