Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Marble
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Education
Marble
Commits
37a64fa2
Commit
37a64fa2
authored
Jul 05, 2016
by
Bernhard Beschow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unused Wikipedia visual category
parent
22db0c17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
7 deletions
+0
-7
src/lib/marble/StyleBuilder.cpp
src/lib/marble/StyleBuilder.cpp
+0
-5
src/lib/marble/declarative/Placemark.cpp
src/lib/marble/declarative/Placemark.cpp
+0
-1
src/lib/marble/geodata/data/GeoDataFeature.h
src/lib/marble/geodata/data/GeoDataFeature.h
+0
-1
No files found.
src/lib/marble/StyleBuilder.cpp
View file @
37a64fa2
...
...
@@ -421,10 +421,6 @@ void StyleBuilder::Private::initializeDefaultStyles()
=
GeoDataStyle
::
Ptr
(
new
GeoDataStyle
(
MarbleDirs
::
path
(
"bitmaps/observatory.png"
),
QFont
(
defaultFamily
,
defaultSize
,
50
,
false
),
defaultLabelColor
));
m_defaultStyle
[
GeoDataFeature
::
Wikipedia
]
=
GeoDataStyle
::
Ptr
(
new
GeoDataStyle
(
MarbleDirs
::
path
(
"bitmaps/wikipedia.png"
),
QFont
(
defaultFamily
,
defaultSize
,
50
,
false
),
defaultLabelColor
));
m_defaultStyle
[
GeoDataFeature
::
OsmSite
]
=
GeoDataStyle
::
Ptr
(
new
GeoDataStyle
(
MarbleDirs
::
path
(
"bitmaps/osm.png"
),
QFont
(
defaultFamily
,
defaultSize
,
50
,
false
),
defaultLabelColor
));
...
...
@@ -1190,7 +1186,6 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames
[
GeoDataFeature
::
GeoDataFeature
::
AirPort
]
=
"AirPort"
;
visualCategoryNames
[
GeoDataFeature
::
GeoDataFeature
::
Observatory
]
=
"Observatory"
;
visualCategoryNames
[
GeoDataFeature
::
GeoDataFeature
::
MilitaryDangerArea
]
=
"MilitaryDangerArea"
;
visualCategoryNames
[
GeoDataFeature
::
GeoDataFeature
::
Wikipedia
]
=
"Wikipedia"
;
visualCategoryNames
[
GeoDataFeature
::
GeoDataFeature
::
OsmSite
]
=
"OsmSite"
;
visualCategoryNames
[
GeoDataFeature
::
Coordinate
]
=
"Coordinate"
;
visualCategoryNames
[
GeoDataFeature
::
MannedLandingSite
]
=
"MannedLandingSite"
;
...
...
src/lib/marble/declarative/Placemark.cpp
View file @
37a64fa2
...
...
@@ -200,7 +200,6 @@ QString Placemark::categoryName(GeoDataFeature::GeoDataVisualCategory category)
case
GeoDataFeature
::
AirPort
:
return
tr
(
"Air Port"
);
case
GeoDataFeature
::
Observatory
:
return
tr
(
"Observatory"
);
case
GeoDataFeature
::
MilitaryDangerArea
:
return
tr
(
"Military Danger Area"
);
case
GeoDataFeature
::
Wikipedia
:
return
tr
(
"Wikipedia"
);
case
GeoDataFeature
::
OsmSite
:
return
tr
(
"OSM Site"
);
case
GeoDataFeature
::
Coordinate
:
return
tr
(
"Coordinate"
);
case
GeoDataFeature
::
Folder
:
return
tr
(
"Folder"
);
...
...
src/lib/marble/geodata/data/GeoDataFeature.h
View file @
37a64fa2
...
...
@@ -130,7 +130,6 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
MilitaryDangerArea
,
// Runners
Wikipedia
,
OsmSite
,
Coordinate
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment