Map information tool: Even more code cleanup

Improve code quality

Author: dl3sdo

src/gui/map/map_information.cpp

@@ -25,6 +25,7 @@
 
 #include <Qt>
 #include <QDialogButtonBox>
+#include <QFontInfo>
 #include <QHeaderView>
 #include <QLatin1Char>
 #include <QTreeWidget>
@@ -35,6 +36,7 @@
 #include "core/georeferencing.h"
 #include "core/map.h"
 #include "core/objects/object.h"
+#include "core/symbols/symbol.h"
 #include "core/symbols/text_symbol.h"
 #include "undo/undo_manager.h"
 
@@ -86,14 +88,14 @@ void MapInformation::retrieveInformation()
 
 	for (int i = 0; i < map_information.colors_num; ++i)
 	{
-		auto map_color = map->getMapColor(i);
+		const auto* map_color = map->getMapColor(i);
 		if (map_color)
 		{
 			ColorUsage color = {};
 			color.name = map_color->getName();
 			for (int j = 0; j < map_information.symbols_num; ++j)
 			{
-				auto symbol = map->getSymbol(j);
+				const auto* symbol = map->getSymbol(j);
 				if (symbol->getType())
 				{
 					if (symbol->containsColor(map_color))
@@ -106,39 +108,38 @@ void MapInformation::retrieveInformation()
 		}
 	}
 
-	const UndoManager &undo_manager = map->undoManager();
+	const auto& undo_manager = map->undoManager();
 	map_information.undo_steps_num = undo_manager.canUndo() ? undo_manager.undoStepCount() : 0;
 	map_information.redo_steps_num = undo_manager.canRedo() ? undo_manager.redoStepCount() : 0;
 
 	int i = 0;
-	for (auto &name : {tr("Point symbols"), tr("Line symbols"), tr("Area symbols"), tr("Text symbols"), tr("Combined symbols"), tr("Undefined symbols")})
+	for (auto& name : {tr("Point symbols"), tr("Line symbols"), tr("Area symbols"), tr("Text symbols"), tr("Combined symbols"), tr("Undefined symbols")})
 		map_information.map_objects[i++].category.name = name;
 
 	for (i = 0; i < map_information.map_parts_num; ++i)
 	{
-		const auto map_part = map->getPart(i);
+		const auto* map_part = map->getPart(i);
 		const auto map_part_objects = map_part->getNumObjects();
-		ItemNum map_part_info = {map_part->getName(), map_part_objects};
-		map_information.map_parts.push_back(map_part_info);
+		map_information.map_parts.push_back({map_part->getName(), map_part_objects});
 		map_information.map_objects_num += map_part_objects;
 
 		for (int j = 0; j < map_part_objects; ++j)
 		{
-			const auto *symbol = map_part->getObject(j)->getSymbol();
+			const auto* symbol = map_part->getObject(j)->getSymbol();
 			addSymbol(symbol);
 		}
 	}
-	for (auto &map_object : map_information.map_objects)
+	for (auto& map_object : map_information.map_objects)
 	{
 		if (map_object.category.num > 1)
 		{
-			auto &objects_vector = map_object.objects;
-			sort(begin(objects_vector), end(objects_vector), [](const SymbolNum &sym1, const SymbolNum &sym2) { return Symbol::lessByNumber(sym1.symbol, sym2.symbol); });
+			auto& objects_vector = map_object.objects;
+			sort(begin(objects_vector), end(objects_vector), [](const SymbolNum& sym1, const SymbolNum& sym2) { return Symbol::lessByNumber(sym1.symbol, sym2.symbol); });
 		}
 	}
 	for (i = 0; i < map_information.symbols_num; ++i)
 	{
-		auto symbol = map->getSymbol(i);
+		const auto* symbol = map->getSymbol(i);
 		if (symbol->getType() == Symbol::Text)
 		{
 			addFont(symbol);
@@ -157,9 +158,9 @@ void MapInformation::addSymbol(const Symbol* symbol)
 			break;
 	}
 	const bool undefined_object = map->findSymbolIndex(symbol) < 0;
-	auto &object_category = map_information.map_objects[symbol_index];
-	auto &objects_vector = object_category.objects;
-	auto found = std::find_if(begin(objects_vector), end(objects_vector), [&symbol](const SymbolNum &sym_count) { return sym_count.symbol == symbol; });
+	auto& object_category = map_information.map_objects[symbol_index];
+	auto& objects_vector = object_category.objects;
+	auto found = std::find_if(begin(objects_vector), end(objects_vector), [&symbol](const SymbolNum& sym_count) { return sym_count.symbol == symbol; });
 	if (found != std::end(objects_vector))
 	{
 		++found->num;
@@ -169,7 +170,7 @@ void MapInformation::addSymbol(const Symbol* symbol)
 		std::vector<QString> colors;
 		for (int i = 0; i < map_information.colors_num; ++i)
 		{
-			auto map_color = map->getMapColor(i);
+			const auto* map_color = map->getMapColor(i);
 			if (map_color && symbol->containsColor(map_color))
 			{
 				colors.push_back({map_color->getName()});
@@ -180,14 +181,13 @@ void MapInformation::addSymbol(const Symbol* symbol)
 	++object_category.category.num;
 }
 
-void MapInformation::addFont(Symbol* symbol)
+void MapInformation::addFont(const Symbol* symbol)
 {
-	TextSymbol *text_symbol = symbol->asText();
-	auto font_family = text_symbol->getFontFamily();
-	auto font_info = QFontInfo(text_symbol->getQFont());
-	auto font_family_substituted = font_info.family();
-	auto &font_names = map_information.font_names;
-	auto found = std::find_if(begin(font_names), end(font_names), [&font_family](const FontNum &font_count) { return font_count.name == font_family; });
+	const auto* text_symbol = symbol->asText();
+	const auto& font_family = text_symbol->getFontFamily();
+	const auto font_family_substituted = QFontInfo(text_symbol->getQFont()).family();
+	auto& font_names = map_information.font_names;
+	auto found = std::find_if(begin(font_names), end(font_names), [&font_family](const FontNum& font_count) { return font_count.name == font_family; });
 	if (found != std::end(font_names))
 	{
 		++found->num;
@@ -210,7 +210,7 @@ void MapInformation::buildTree()
 	addTreeItem(1, tr("Coordinate reference system"), map_information.map_crs);
 
 	addTreeItem(0, tr("Map parts"), tr("%n part(s)", nullptr, map_information.map_parts_num));
-	for (const auto &map_part : map_information.map_parts)
+	for (const auto& map_part : map_information.map_parts)
 	{
 		addTreeItem(1, map_part.name, tr("%n object(s)", nullptr, map_part.num));
 	}
@@ -221,27 +221,27 @@ void MapInformation::buildTree()
 
 	if (map_information.undo_steps_num || map_information.redo_steps_num)
 	{
-		QString s = map_information.undo_steps_num ? tr("Undo") : tr("Redo");
-		QString n = QString::fromLatin1("%1").arg(map_information.undo_steps_num ? map_information.undo_steps_num : map_information.redo_steps_num);
+		QString undo_redo_type = map_information.undo_steps_num ? tr("Undo") : tr("Redo");
+		QString undo_redo_num = QString::fromLatin1("%1").arg(map_information.undo_steps_num ? map_information.undo_steps_num : map_information.redo_steps_num);
 		if (map_information.undo_steps_num && map_information.redo_steps_num)
 		{
-			s.append(QLatin1Char('/')).append(tr("Redo"));
-			n.append(QString::fromLatin1("/%1").arg(map_information.redo_steps_num));
+			undo_redo_type.append(QLatin1Char('/')).append(tr("Redo"));
+			undo_redo_num.append(QString::fromLatin1("/%1").arg(map_information.redo_steps_num));
 		}
-		s.append(QLatin1Char(' ')).append(tr("steps"));
-		n.append(QLatin1Char(' ')).append(map_information.undo_steps_num + map_information.redo_steps_num > 1 ? tr("steps") : tr("step"));
-		addTreeItem(0, s, n);
+		undo_redo_type.append(QLatin1Char(' ')).append(tr("steps"));
+		undo_redo_num.append(QLatin1Char(' ')).append(map_information.undo_steps_num + map_information.redo_steps_num > 1 ? tr("steps") : tr("step"));
+		addTreeItem(0, undo_redo_type, undo_redo_num);
 	}
 
 	addTreeItem(0, tr("Colors"), tr("%n color(s)", nullptr, map_information.colors_num));
 	if (map_information.colors_num)
 	{
-		for (const auto &color : map_information.colors)
+		for (const auto& color : map_information.colors)
 		{
 			addTreeItem(1, color.name);
 			if (color.symbols.size())
 			{
-				for (const auto &symbol : color.symbols)
+				for (const auto& symbol : color.symbols)
 				{
 					addTreeItem(2, symbol);
 				}
@@ -250,24 +250,24 @@ void MapInformation::buildTree()
 	}
 
 	addTreeItem(0, tr("Fonts"), tr("%n font(s)", nullptr, map_information.fonts_num));
-	for (const auto &font_name : map_information.font_names)
+	for (const auto& font_name : map_information.font_names)
 	{
 		addTreeItem(1, (font_name.name == font_name.name_substitute ? font_name.name : font_name.name + tr(" (substituted by ") + font_name.name_substitute + QLatin1Char(')')), 
 					tr("%n symbol(s)", nullptr, font_name.num));
 	}
 
 	addTreeItem(0, tr("Objects"), tr("%n object(s)", nullptr, map_information.map_objects_num));
-	for (const auto &map_object : map_information.map_objects)
+	for (const auto& map_object : map_information.map_objects)
 	{
 		if (map_object.category.num)
 		{
 			addTreeItem(1, map_object.category.name, tr("%n object(s)", nullptr, map_object.category.num));
-			for (const auto &object : map_object.objects)
+			for (const auto& object : map_object.objects)
 			{
 				addTreeItem(2, object.name, tr("%n object(s)", nullptr, object.num));
 				if (object.colors.size())
 				{
-					for (const auto &color : object.colors)
+					for (const auto& color : object.colors)
 					{
 						addTreeItem(3, color);
 					}
@@ -287,14 +287,14 @@ void MapInformation::addTreeItem(const int level, const QString item, const QStr
 	for (; tree_depth > level; --tree_depth)
 		tree_item_hierarchy.pop_back();
 
-	QTreeWidgetItem *tree_item;
+	QTreeWidgetItem* tree_item;
 	if (tree_depth)
 		tree_item = new QTreeWidgetItem(tree_item_hierarchy.back());
 	else
 		tree_item = new QTreeWidgetItem(map_info_tree);
 	tree_item->setText(0, item);
 	tree_item->setText(1, value);
-	tree_item_hierarchy.push_back(tree_item);	// always store last tree item
+	tree_item_hierarchy.emplace_back(tree_item);	// always store last tree item
 }
 
 inline

src/gui/map/map_information.h

@@ -120,7 +120,7 @@ Q_OBJECT
 	 * Retrieves font (and its substitution) for a given text symbol and counts
 	 * the font occurence.
 	 */
-	void addFont(Symbol* symbol);
+	void addFont(const Symbol* symbol);
 
 	/**
 	 * Creates the textual information from the stored information and