mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-10 22:31:40 +02:00
code review
This commit is contained in:
@@ -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),
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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())
|
||||
{
|
||||
|
Reference in New Issue
Block a user