Merge pull request #24 from IhateTrains/tweak

Enable IntrinsicFunctions, add const to pointers and references

Author: Ivo Elezović

ProvinceMapper.vcxproj

@@ -168,6 +168,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

ProvinceMapper/Source/Definitions/Definitions.cpp

@@ -74,7 +74,7 @@ void Definitions::parseStream(std::istream& theStream, const LocalizationMapper&
 	}
 }
 
-std::optional<std::tuple<int, unsigned char, unsigned char, unsigned char, std::string>> Definitions::parseLine(const std::string& line)
+std::optional<std::tuple<int, unsigned char, unsigned char, unsigned char, std::string>> Definitions::parseLine(const std::string& line) const
 {
 	try
 	{

ProvinceMapper/Source/Definitions/Definitions.h

@@ -23,7 +23,7 @@ class Definitions
 
   private:
 	void parseStream(std::istream& theStream, const LocalizationMapper& localizationMapper, LocalizationMapper::LocType locType);
-	[[nodiscard]] std::optional<std::tuple<int, unsigned char, unsigned char, unsigned char, std::string>> parseLine(const std::string& line);
+	[[nodiscard]] std::optional<std::tuple<int, unsigned char, unsigned char, unsigned char, std::string>> parseLine(const std::string& line) const;
 
 	std::map<int, std::shared_ptr<Province>> provinces;				// ID, province
 	std::map<unsigned int, std::shared_ptr<Province>> chromaCache; // color, province

ProvinceMapper/Source/Frames/Images/ImageCanvas.cpp

@@ -205,7 +205,7 @@ void ImageCanvas::onMouseOver(wxMouseEvent& event)
 	event.Skip();
 }
 
-void ImageCanvas::leftUp(wxMouseEvent& event)
+void ImageCanvas::leftUp(const wxMouseEvent& event)
 {
 	// Left up means:
 	// 1. select a mapping, or
@@ -284,7 +284,7 @@ void ImageCanvas::rightUp(wxMouseEvent& event)
 	// If our active link is dry, we're not deselecting it, we're deleting it.
 	if (activeLink)
 	{
-		auto* evt = new wxCommandEvent(wxEVT_DEACTIVATE_LINK);
+		const auto* evt = new wxCommandEvent(wxEVT_DEACTIVATE_LINK);
 		eventHandler->QueueEvent(evt->Clone());
 	}
 	event.Skip();
@@ -471,12 +471,12 @@ void ImageCanvas::stageDeleteLink() const
 	// Do nothing unless working on active link. Don't want accidents here.
 	if (activeLink)
 	{
-		auto* evt = new wxCommandEvent(wxEVT_DELETE_ACTIVE_LINK);
+		const auto* evt = new wxCommandEvent(wxEVT_DELETE_ACTIVE_LINK);
 		eventHandler->QueueEvent(evt->Clone());
 	}
 }
 
-void ImageCanvas::onMouseWheel(wxMouseEvent& event)
+void ImageCanvas::onMouseWheel(const wxMouseEvent& event)
 {
 	if (event.GetWheelRotation() != 0)
 	{
@@ -568,7 +568,7 @@ void ImageCanvas::stageMoveUp() const
 {
 	if (activeLink)
 	{
-		auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_LINK_UP);
+		const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_LINK_UP);
 		eventHandler->QueueEvent(evt->Clone());
 	}
 }
@@ -577,32 +577,32 @@ void ImageCanvas::stageMoveDown() const
 {
 	if (activeLink)
 	{
-		auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_LINK_DOWN);
+		const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_LINK_DOWN);
 		eventHandler->QueueEvent(evt->Clone());
 	}
 }
 
 void ImageCanvas::stageSave() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_SAVE_LINKS);
+	const auto* evt = new wxCommandEvent(wxEVT_SAVE_LINKS);
 	eventHandler->QueueEvent(evt->Clone());
 }
 
 void ImageCanvas::stageAddLink() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_ADD_LINK);
+	const auto* evt = new wxCommandEvent(wxEVT_ADD_LINK);
 	eventHandler->QueueEvent(evt->Clone());
 }
 
 void ImageCanvas::stageMoveVersionLeft() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_LEFT);
+	const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_LEFT);
 	eventHandler->QueueEvent(evt->Clone());
 }
 
 void ImageCanvas::stageMoveVersionRight() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_RIGHT);
+	const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_RIGHT);
 	eventHandler->QueueEvent(evt->Clone());
 }
 

ProvinceMapper/Source/Frames/Images/ImageCanvas.h

@@ -69,10 +69,10 @@ class ImageCanvas: public wxScrolledCanvas
 
   private:
 	void onMouseOver(wxMouseEvent& event);
-	void leftUp(wxMouseEvent& event);
+	void leftUp(const wxMouseEvent& event);
 	void rightUp(wxMouseEvent& event);
 	void onKeyDown(wxKeyEvent& event);
-	void onMouseWheel(wxMouseEvent& event);
+	void onMouseWheel(const wxMouseEvent& event);
 	void onScrollRelease(wxScrollWinEvent& event);
 
 	void stageAddComment();

ProvinceMapper/Source/Frames/Images/ImageFrame.cpp

@@ -66,7 +66,7 @@ void ImageFrame::onScrollPaint(wxPaintEvent& event)
 	render();
 }
 
-void ImageFrame::onRefresh(wxCommandEvent& event)
+void ImageFrame::onRefresh(const wxCommandEvent& event)
 {
 	// force refresh comes from zooming. We need to store and then recalculate scroll position.
 	if (event.GetId() == 0)
@@ -289,7 +289,7 @@ void ImageFrame::onToggleBlack(wxCommandEvent& event)
 	Refresh();
 }
 
-void ImageFrame::onClose(wxCloseEvent& event)
+void ImageFrame::onClose(const wxCloseEvent& event)
 {
 	// We need to kill the app.
 	eventHandler->QueueEvent(event.Clone());
@@ -443,7 +443,7 @@ void ImageFrame::onTriangulate(wxCommandEvent& event)
 	Refresh();
 }
 
-void ImageFrame::onPointPlaced(wxCommandEvent& event)
+void ImageFrame::onPointPlaced(const wxCommandEvent& event)
 {
 	statusBar->setPointPlaced(event.GetInt());
 	if (event.GetInt() <= 3)
@@ -529,7 +529,7 @@ void ImageFrame::buildBounds()
 	targetRect = wxRect(wxPoint(static_cast<int>(minX), static_cast<int>(minY)), wxPoint(static_cast<int>(maxX), static_cast<int>(maxY)));
 }
 
-void ImageFrame::triangulateAtPoint(wxCommandEvent& event)
+void ImageFrame::triangulateAtPoint(const wxCommandEvent& event)
 {
 	if (!triangulationIsSane)
 		return;
@@ -646,15 +646,15 @@ void ImageFrame::onMove(wxMoveEvent& event)
 	event.Skip();
 }
 
-void ImageFrame::onLock(wxCommandEvent& event)
+void ImageFrame::onLock(const wxCommandEvent& event)
 {
 	if (event.GetInt() == 0)
 		lock = false;
 	else
 		lock = true;
 }
 
-void ImageFrame::onScrollReleaseH(wxCommandEvent& event)
+void ImageFrame::onScrollReleaseH(const wxCommandEvent& event)
 {
 	if (lock)
 	{
@@ -680,7 +680,7 @@ void ImageFrame::onScrollReleaseH(wxCommandEvent& event)
 	targetCanvas->clearOldScrollH();
 }
 
-void ImageFrame::onScrollReleaseV(wxCommandEvent& event)
+void ImageFrame::onScrollReleaseV(const wxCommandEvent& event)
 {
 	if (lock)
 	{

ProvinceMapper/Source/Frames/Images/ImageFrame.h

@@ -40,16 +40,16 @@ class ImageFrame: public wxFrame
 	void onScrollPaint(wxPaintEvent& event);
 	void onToggleOrientation(wxCommandEvent& event);
 	void onToggleBlack(wxCommandEvent& event);
-	void onClose(wxCloseEvent& event);
-	void onRefresh(wxCommandEvent& event);
+	void onClose(const wxCloseEvent& event);
+	void onRefresh(const wxCommandEvent& event);
 	void onTriangulate(wxCommandEvent& event);
-	void onPointPlaced(wxCommandEvent& event);
-	void triangulateAtPoint(wxCommandEvent& event);
+	void onPointPlaced(const wxCommandEvent& event);
+	void triangulateAtPoint(const wxCommandEvent& event);
 	void onResize(wxSizeEvent& event);
 	void onMove(wxMoveEvent& event);
-	void onLock(wxCommandEvent& event);
-	void onScrollReleaseH(wxCommandEvent& event);
-	void onScrollReleaseV(wxCommandEvent& event);
+	void onLock(const wxCommandEvent& event);
+	void onScrollReleaseH(const wxCommandEvent& event);
+	void onScrollReleaseV(const wxCommandEvent& event);
 
 	void render() const;
 	void renderSource() const;

ProvinceMapper/Source/Frames/Images/StatusBar.cpp

@@ -79,7 +79,7 @@ StatusBar::StatusBar(wxWindow* parent, const wxPoint& position, std::shared_ptr<
 	SetIcon(wxIcon(wxT("converter.ico"), wxBITMAP_TYPE_ICO, 16, 16));
 }
 
-void StatusBar::onZoomChanged(wxCommandEvent& evt)
+void StatusBar::onZoomChanged(const wxCommandEvent& evt)
 {
 	if (evt.GetId() == 0)
 	{
@@ -146,9 +146,9 @@ void StatusBar::setTargetZoom(const int zoomLevel) const
 	targetZoomField->ChangeValue(std::to_string(zoomLevel));
 }
 
-void StatusBar::onZoomResetButton(wxCommandEvent& evt)
+void StatusBar::onZoomResetButton(const wxCommandEvent& evt)
 {
-	const auto zoomLevel = 100;
+	constexpr auto zoomLevel = 100;
 	wxCommandEvent event(wxEVT_REFRESH);
 	if (evt.GetId() == 0)
 	{

ProvinceMapper/Source/Frames/Images/StatusBar.h

@@ -22,8 +22,8 @@ class StatusBar: public wxFrame
 
   private:
 	void onMove(wxMoveEvent& event);
-	void onZoomChanged(wxCommandEvent& evt);
-	void onZoomResetButton(wxCommandEvent& evt);
+	void onZoomChanged(const wxCommandEvent& evt);
+	void onZoomResetButton(const wxCommandEvent& evt);
 	void onTriangulate(wxCommandEvent& evt);
 	void onClose(wxCloseEvent& event);
 	void onLock(wxCommandEvent& evt);

ProvinceMapper/Source/Frames/Links/LinksFrame.cpp

@@ -52,7 +52,7 @@ void LinksFrame::onResize(wxSizeEvent& event)
 	event.Skip();
 }
 
-void LinksFrame::onClose(wxCloseEvent& event)
+void LinksFrame::onClose(const wxCloseEvent& event)
 {
 	// We need to kill the app.
 	eventHandler->QueueEvent(event.Clone());
@@ -204,13 +204,13 @@ void LinksFrame::onKeyDown(wxKeyEvent& event)
 
 void LinksFrame::stageMoveVersionLeft() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_LEFT);
+	const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_LEFT);
 	eventHandler->QueueEvent(evt->Clone());
 }
 
 void LinksFrame::stageMoveVersionRight() const
 {
-	auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_RIGHT);
+	const auto* evt = new wxCommandEvent(wxEVT_MOVE_ACTIVE_VERSION_RIGHT);
 	eventHandler->QueueEvent(evt->Clone());
 }