code review

mapeditor/campaigneditor/campaignview.cpp

@@ -21,7 +21,7 @@ CampaignView::CampaignView(QWidget * parent):
 {
 }
 
-ClickablePixmapItem::ClickablePixmapItem(const QPixmap &pixmap, std::function<void()> clickedCallback, std::function<void()> doubleClickedCallback, std::function<void(QGraphicsSceneContextMenuEvent *)> contextMenuCallback):
+ClickablePixmapItem::ClickablePixmapItem(const QPixmap &pixmap, const std::function<void()> & clickedCallback, const std::function<void()> & doubleClickedCallback, const std::function<void(QGraphicsSceneContextMenuEvent *)> & contextMenuCallback):
 	QGraphicsPixmapItem(pixmap),
 	clickedCallback(clickedCallback),
 	doubleClickedCallback(doubleClickedCallback),

mapeditor/campaigneditor/campaignview.h

@@ -30,7 +30,7 @@ public:
 
 class ClickablePixmapItem : public QGraphicsPixmapItem {
 public:
-	ClickablePixmapItem(const QPixmap &pixmap, std::function<void()> clickedCallback, std::function<void()> doubleClickedCallback, std::function<void(QGraphicsSceneContextMenuEvent *)> contextMenuCallback);
+	ClickablePixmapItem(const QPixmap &pixmap, const std::function<void()> & clickedCallback, const std::function<void()> & doubleClickedCallback, const std::function<void(QGraphicsSceneContextMenuEvent *)> & contextMenuCallback);
 
 protected:
 	void mousePressEvent(QGraphicsSceneMouseEvent *event) override;

mapeditor/campaigneditor/scenarioproperties.cpp

@@ -206,11 +206,11 @@ void ScenarioProperties::reloadMapRelatedUi()
 			}
 			else
 			{
-				for(int i = 0; i < scenario.getNum(); ++i)
+				for(int j = 0; j < scenario.getNum(); ++j)
 				{
-					auto tmpScenario = CampaignScenarioID(i);
+					auto tmpScenario = CampaignScenarioID(j);
 					auto text = getRegionChar(tmpScenario.getNum()) + " - " + QString::fromStdString(campaignState->scenarios.at(tmpScenario).mapName);
-					comboBoxOption->addItem(text, i);
+					comboBoxOption->addItem(text, j);
 				}
 			}
 

mapeditor/helper.cpp

@@ -81,7 +81,7 @@ void Helper::saveCampaign(std::shared_ptr<CampaignState> campaignState, const QS
 {
 	auto jsonCampaign = CampaignHandler::writeHeaderToJson(*campaignState);
 	
-	std::shared_ptr<CIOApi> io(new CDefaultIOApi());
+	auto io = std::make_shared<CDefaultIOApi>();
 	auto saver = std::make_shared<CZipSaver>(io, filename.toStdString());
 	for(auto & scenario : campaignState->allScenarios())
 	{