[Marble-commits] KDE/kdeedu/marble/src

[Eckhart Wörner]

SVN commit 1009375 by ewoerner:

Use different names for different handler registrars


 M  +1 -1      lib/geodata/handlers/osm-namefinder/DescriptionTagHandler.cpp  
 M  +1 -1      lib/geodata/handlers/osm-namefinder/NamedTagHandler.cpp  
 M  +1 -1      lib/geodata/handlers/osm-namefinder/NearestPlacesTagHandler.cpp  
 M  +1 -1      lib/geodata/handlers/osm-namefinder/PlaceTagHandler.cpp  
 M  +1 -1      lib/geodata/handlers/osm-namefinder/SearchResultsTagHandler.cpp  
 M  +1 -1      plugins/render/osmannotate/osm/OsmBoundsTagHandler.cpp  
 M  +1 -1      plugins/render/osmannotate/osm/OsmNodeTagHandler.cpp  
 M  +1 -1      plugins/render/osmannotate/osm/OsmWayTagHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/DescriptionTagHandler.cpp #1009374:1009375
@@ -32,7 +32,7 @@
 {
 
 static GeoTagHandlerRegistrar
-handler( GeoTagHandler::QualifiedName( tag_description, tag_namespace ),
+descriptionTagHandler( GeoTagHandler::QualifiedName( tag_description, tag_namespace ),
          new DescriptionTagHandler );
 
 GeoNode * DescriptionTagHandler::parse( GeoParser & parser ) const
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/NamedTagHandler.cpp #1009374:1009375
@@ -34,7 +34,7 @@
 {
 
 static GeoTagHandlerRegistrar
-handler( GeoTagHandler::QualifiedName( tag_named, tag_namespace ),
+namedTagHandler( GeoTagHandler::QualifiedName( tag_named, tag_namespace ),
          new NamedTagHandler );
 
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/NearestPlacesTagHandler.cpp #1009374:1009375
@@ -32,7 +32,7 @@
 {
 
 static GeoTagHandlerRegistrar
-s_handler( GeoTagHandler::QualifiedName( tag_nearestplaces, tag_namespace ),
+nearestPlacesTagHandler( GeoTagHandler::QualifiedName( tag_nearestplaces, tag_namespace ),
            new NearestPlacesTagHandler );
 
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/PlaceTagHandler.cpp #1009374:1009375
@@ -32,7 +32,7 @@
 {
 
 static GeoTagHandlerRegistrar
-handler( GeoTagHandler::QualifiedName( tag_place, tag_namespace ),
+placeTagHandler( GeoTagHandler::QualifiedName( tag_place, tag_namespace ),
          new PlaceTagHandler );
 
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/SearchResultsTagHandler.cpp #1009374:1009375
@@ -36,7 +36,7 @@
 {
 
 static GeoTagHandlerRegistrar
-handler( GeoTagHandler::QualifiedName( tag_searchresults, tag_namespace ),
+searchTagHandler( GeoTagHandler::QualifiedName( tag_searchresults, tag_namespace ),
          new SearchResultsTagHandler );
 
 
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm/OsmBoundsTagHandler.cpp #1009374:1009375
@@ -22,7 +22,7 @@
 namespace osm
 {
 
-static GeoTagHandlerRegistrar s_handlerbounds( GeoTagHandler::QualifiedName(osmTag_bounds, ""),
+static GeoTagHandlerRegistrar osmBoundsTagHandler( GeoTagHandler::QualifiedName(osmTag_bounds, ""),
                                                new OsmBoundsTagHandler() );
 
 GeoNode* OsmBoundsTagHandler::parse( GeoParser& parser ) const
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm/OsmNodeTagHandler.cpp #1009374:1009375
@@ -24,7 +24,7 @@
 
 QMap<int, OsmNodeGraphicsItem*> OsmNodeTagHandler::nodeRef;
 
-static GeoTagHandlerRegistrar s_handlerbounds( GeoTagHandler::QualifiedName(osmTag_node, ""),
+static GeoTagHandlerRegistrar osmNodeTagHandler( GeoTagHandler::QualifiedName(osmTag_node, ""),
                                                new OsmNodeTagHandler() );
 
 GeoNode* OsmNodeTagHandler::parse ( GeoParser& parser) const
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm/OsmWayTagHandler.cpp #1009374:1009375
@@ -21,7 +21,7 @@
 namespace osm
 {
 
-static GeoTagHandlerRegistrar s_handlerbounds( GeoTagHandler::QualifiedName(osmTag_way, ""),
+static GeoTagHandlerRegistrar osmWayTagHandler( GeoTagHandler::QualifiedName(osmTag_way, ""),
                                                new OsmWayTagHandler() );
 
 GeoNode* OsmWayTagHandler::parse( GeoParser& parser ) const