summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-08-14 11:48:28 (GMT)
committerBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-08-14 11:48:55 (GMT)
commit2f6f22988b14810b25973e4be57de5f930bef8c9 (patch)
treeda5d293f600becee4b2864591b92096fb3bb5605
parent815379faeb5fd788ea41f60e605d08c48cf3b4a4 (diff)
remove convenience method that was used only once
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp6
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.h6
-rw-r--r--src/lib/marble/osm/OsmTagEditorWidget.cpp2
3 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 7856268..0854231 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -484,12 +484,6 @@ GeoDataStyle::ConstPtr OsmPresetLibrary::presetStyle( const OsmTag &tag )
return styleBuilder.presetStyle(category);
}
-bool OsmPresetLibrary::hasVisualCategory ( const OsmTag &tag )
-{
-
- return s_visualCategories.contains( tag );
-}
-
GeoDataFeature::GeoDataVisualCategory OsmPresetLibrary::osmVisualCategory(const OsmTag &tag)
{
initializeOsmVisualCategories();
diff --git a/src/lib/marble/osm/OsmPresetLibrary.h b/src/lib/marble/osm/OsmPresetLibrary.h
index 48c0fc4..9304949 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.h
+++ b/src/lib/marble/osm/OsmPresetLibrary.h
@@ -43,12 +43,6 @@ public:
static GeoDataFeature::GeoDataVisualCategory osmVisualCategory(const OsmTag &tag);
/**
- * @brief hasVisualCategory returns true if there is a visual category associated with
- * @p tag
- */
- static bool hasVisualCategory( const OsmTag &tag );
-
- /**
* @brief begin and end provide an stl style iterator for the preset map
*/
static QMap<OsmTag, GeoDataFeature::GeoDataVisualCategory>::const_iterator begin();
diff --git a/src/lib/marble/osm/OsmTagEditorWidget.cpp b/src/lib/marble/osm/OsmTagEditorWidget.cpp
index a4af9d4..ca50e58 100644
--- a/src/lib/marble/osm/OsmTagEditorWidget.cpp
+++ b/src/lib/marble/osm/OsmTagEditorWidget.cpp
@@ -82,7 +82,7 @@ OsmTagEditorWidget::OsmTag OsmTagEditorWidget::suitableTag() const
for (int index = 0; index < d->m_currentTagsList->topLevelItemCount(); ++index) {
const QTreeWidgetItem *item = d->m_currentTagsList->topLevelItem( index );
const auto tag = OsmTag(item->text(0), item->text(1));
- if ( OsmPresetLibrary::hasVisualCategory( tag ) ) {
+ if (OsmPresetLibrary::osmVisualCategory(tag) != GeoDataFeature::None) {
return tag;
}
}