drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
libs/kml/types.hpp
View File

@@ -70,7 +70,7 @@ inline std::string DebugPrint(PredefinedColor color)
{
switch (color)
{
using enum kml::PredefinedColor;
using enum kml::PredefinedColor;
case None: return "None";
case Red: return "Red";
case Blue: return "Blue";
@@ -97,7 +97,7 @@ inline dp::Color ColorFromPredefinedColor(PredefinedColor color)
{
switch (color)
{
using enum kml::PredefinedColor;
using enum kml::PredefinedColor;
case Red: return dp::Color(229, 27, 35, 255);
case Pink: return dp::Color(255, 65, 130, 255);
case Purple: return dp::Color(155, 36, 178, 255);
@@ -139,7 +139,7 @@ inline std::string DebugPrint(AccessRules accessRules)
{
switch (accessRules)
{
using enum kml::AccessRules;
using enum kml::AccessRules;
case Local: return "Local";
case Public: return "Public";
case DirectLink: return "DirectLink";
@@ -163,7 +163,7 @@ inline std::string DebugPrint(CompilationType compilationType)
{
switch (compilationType)
{
using enum kml::CompilationType;
using enum kml::CompilationType;
case Category: return "Category";
case Collection: return "Collection";
case Day: return "Day";
@@ -221,7 +221,7 @@ inline std::string ToString(BookmarkIcon icon)
{
switch (icon)
{
using enum kml::BookmarkIcon;
using enum kml::BookmarkIcon;
case None: return "None";
case Hotel: return "Hotel";
case Animals: return "Animals";
@@ -269,8 +269,7 @@ inline std::string ToString(BookmarkIcon icon)
// will affect previous kmb versions, where this structure was used.
struct ColorData
{
DECLARE_VISITOR_AND_DEBUG_PRINT(ColorData, visitor(m_predefinedColor, "predefinedColor"),
visitor(m_rgba, "rgba"))
DECLARE_VISITOR_AND_DEBUG_PRINT(ColorData, visitor(m_predefinedColor, "predefinedColor"), visitor(m_rgba, "rgba"))
bool operator==(ColorData const & data) const
{
@@ -291,43 +290,27 @@ struct ColorData
// in case of any changes of its binary format.
struct BookmarkData
{
DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkData, visitor(m_id, "id"),
visitor(m_name, "name"),
visitor(m_description, "description"),
visitor(m_featureTypes, "featureTypes"),
visitor(m_customName, "customName"),
visitor(m_color, "color"),
visitor(m_icon, "icon"),
visitor(m_viewportScale, "viewportScale"),
visitor(m_timestamp, "timestamp"),
visitor(m_point, "point"),
visitor(m_boundTracks, "boundTracks"),
visitor(m_visible, "visible"),
visitor(m_nearestToponym, "nearestToponym"),
visitor(m_minZoom, "minZoom"),
visitor(m_compilations, "compilations"),
visitor(m_properties, "properties"),
DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkData, visitor(m_id, "id"), visitor(m_name, "name"),
visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
visitor(m_customName, "customName"), visitor(m_color, "color"),
visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
visitor(m_boundTracks, "boundTracks"), visitor(m_visible, "visible"),
visitor(m_nearestToponym, "nearestToponym"), visitor(m_minZoom, "minZoom"),
visitor(m_compilations, "compilations"), visitor(m_properties, "properties"),
VISITOR_COLLECTABLE)
DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName,
m_nearestToponym, m_properties)
DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, m_nearestToponym, m_properties)
bool operator==(BookmarkData const & data) const
{
return m_id == data.m_id && m_name == data.m_name &&
m_description == data.m_description &&
m_color == data.m_color && m_icon == data.m_icon &&
m_viewportScale == data.m_viewportScale &&
IsEqual(m_timestamp, data.m_timestamp) &&
m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
m_featureTypes == data.m_featureTypes &&
m_customName == data.m_customName &&
m_boundTracks == data.m_boundTracks &&
m_visible == data.m_visible &&
m_nearestToponym == data.m_nearestToponym &&
m_minZoom == data.m_minZoom &&
m_compilations == data.m_compilations &&
m_properties == data.m_properties;
return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
m_boundTracks == data.m_boundTracks && m_visible == data.m_visible &&
m_nearestToponym == data.m_nearestToponym && m_minZoom == data.m_minZoom &&
m_compilations == data.m_compilations && m_properties == data.m_properties;
}
bool operator!=(BookmarkData const & data) const { return !operator==(data); }
@@ -371,8 +354,7 @@ struct BookmarkData
// will affect previous kmb versions, where this structure was used.
struct TrackLayer
{
DECLARE_VISITOR_AND_DEBUG_PRINT(TrackLayer, visitor(m_lineWidth, "lineWidth"),
visitor(m_color, "color"))
DECLARE_VISITOR_AND_DEBUG_PRINT(TrackLayer, visitor(m_lineWidth, "lineWidth"), visitor(m_color, "color"))
bool operator==(TrackLayer const & layer) const
{
@@ -428,16 +410,11 @@ struct MultiGeometry
struct TrackData
{
DECLARE_VISITOR_AND_DEBUG_PRINT(TrackData, visitor(m_id, "id"),
visitor(m_localId, "localId"),
visitor(m_name, "name"),
visitor(m_description, "description"),
visitor(m_layers, "layers"),
visitor(m_timestamp, "timestamp"),
visitor(m_geometry, "geometry"),
visitor(m_visible, "visible"),
visitor(m_nearestToponyms, "nearestToponyms"),
visitor(m_properties, "properties"),
DECLARE_VISITOR_AND_DEBUG_PRINT(TrackData, visitor(m_id, "id"), visitor(m_localId, "localId"),
visitor(m_name, "name"), visitor(m_description, "description"),
visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
visitor(m_geometry, "geometry"), visitor(m_visible, "visible"),
visitor(m_nearestToponyms, "nearestToponyms"), visitor(m_properties, "properties"),
VISITOR_COLLECTABLE)
DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_nearestToponyms, m_properties)
@@ -445,10 +422,9 @@ struct TrackData
bool operator==(TrackData const & data) const
{
return m_id == data.m_id && m_localId == data.m_localId && m_name == data.m_name &&
m_description == data.m_description && m_layers == data.m_layers &&
IsEqual(m_timestamp, data.m_timestamp) && m_geometry == data.m_geometry &&
m_visible == data.m_visible && m_nearestToponyms == data.m_nearestToponyms &&
m_properties == data.m_properties;
m_description == data.m_description && m_layers == data.m_layers && IsEqual(m_timestamp, data.m_timestamp) &&
m_geometry == data.m_geometry && m_visible == data.m_visible &&
m_nearestToponyms == data.m_nearestToponyms && m_properties == data.m_properties;
}
bool operator!=(TrackData const & data) const { return !operator==(data); }
@@ -480,41 +456,29 @@ struct TrackData
// in case of any changes of its binary format.
struct CategoryData
{
DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryData, visitor(m_id, "id"),
visitor(m_compilationId, "compilationId"),
visitor(m_type, "type"),
visitor(m_name, "name"),
visitor(m_imageUrl, "imageUrl"),
visitor(m_annotation, "annotation"),
visitor(m_description, "description"),
visitor(m_visible, "visible"),
visitor(m_authorName, "authorName"),
visitor(m_authorId, "authorId"),
visitor(m_rating, "rating"),
visitor(m_reviewsNumber, "reviewsNumber"),
visitor(m_lastModified, "lastModified"),
visitor(m_accessRules, "accessRules"),
visitor(m_tags, "tags"),
visitor(m_toponyms, "toponyms"),
visitor(m_languageCodes, "languageCodes"),
visitor(m_properties, "properties"),
VISITOR_COLLECTABLE)
DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryData, visitor(m_id, "id"), visitor(m_compilationId, "compilationId"),
visitor(m_type, "type"), visitor(m_name, "name"), visitor(m_imageUrl, "imageUrl"),
visitor(m_annotation, "annotation"), visitor(m_description, "description"),
visitor(m_visible, "visible"), visitor(m_authorName, "authorName"),
visitor(m_authorId, "authorId"), visitor(m_rating, "rating"),
visitor(m_reviewsNumber, "reviewsNumber"), visitor(m_lastModified, "lastModified"),
visitor(m_accessRules, "accessRules"), visitor(m_tags, "tags"),
visitor(m_toponyms, "toponyms"), visitor(m_languageCodes, "languageCodes"),
visitor(m_properties, "properties"), VISITOR_COLLECTABLE)
DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description,
m_imageUrl, m_authorName, m_authorId, m_tags, m_toponyms, m_properties)
DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description, m_imageUrl, m_authorName, m_authorId,
m_tags, m_toponyms, m_properties)
bool operator==(CategoryData const & data) const
{
double constexpr kEps = 1e-5;
return m_id == data.m_id && m_compilationId == data.m_compilationId &&
m_type == data.m_type && m_name == data.m_name && m_imageUrl == data.m_imageUrl &&
m_annotation == data.m_annotation && m_description == data.m_description &&
m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
return m_id == data.m_id && m_compilationId == data.m_compilationId && m_type == data.m_type &&
m_name == data.m_name && m_imageUrl == data.m_imageUrl && m_annotation == data.m_annotation &&
m_description == data.m_description && m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
fabs(m_rating - data.m_rating) < kEps && m_reviewsNumber == data.m_reviewsNumber &&
IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags &&
m_toponyms == data.m_toponyms && m_languageCodes == data.m_languageCodes &&
m_properties == data.m_properties;
IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags && m_toponyms == data.m_toponyms &&
m_languageCodes == data.m_languageCodes && m_properties == data.m_properties;
}
bool operator!=(CategoryData const & data) const { return !operator==(data); }
@@ -561,10 +525,8 @@ struct CategoryData
struct FileData
{
DECLARE_VISITOR_AND_DEBUG_PRINT(FileData, visitor(m_serverId, "serverId"),
visitor(m_categoryData, "category"),
visitor(m_bookmarksData, "bookmarks"),
visitor(m_tracksData, "tracks"),
DECLARE_VISITOR_AND_DEBUG_PRINT(FileData, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"),
visitor(m_compilationsData, "compilations"))
bool operator==(FileData const & data) const