浏览代码

code style

Andrey Filipenkov 1 年之前
父节点
当前提交
9438c5f9f7
共有 5 个文件被更改,包括 5 次插入4 次删除
  1. 1 0
      mapeditor/mapcontroller.cpp
  2. 0 1
      mapeditor/maphandler.h
  3. 0 1
      mapeditor/playersettings.h
  4. 1 1
      mapeditor/windownewmap.cpp
  5. 3 1
      mapeditor/windownewmap.h

+ 1 - 0
mapeditor/mapcontroller.cpp

@@ -8,6 +8,7 @@
  *
  */
 
+#include "StdInc.h"
 #include "mapcontroller.h"
 
 #include "../lib/ArtifactUtils.h"

+ 0 - 1
mapeditor/maphandler.h

@@ -11,7 +11,6 @@
 #pragma once
 //code is copied from vcmiclient/mapHandler.h with minimal changes
 
-#include "StdInc.h"
 #include "../lib/int3.h"
 #include "Animation.h"
 

+ 0 - 1
mapeditor/playersettings.h

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "StdInc.h"
 #include <QDialog>
 #include "playerparams.h"
 

+ 1 - 1
mapeditor/windownewmap.cpp

@@ -108,7 +108,7 @@ bool WindowNewMap::loadUserSettings()
 
 		ui->widthTxt->setText(QString::number(mapGenOptions.getWidth()));
 		ui->heightTxt->setText(QString::number(mapGenOptions.getHeight()));
-		for(auto & sz : mapSizes)
+		for(const auto & sz : mapSizes)
 		{
 			if(sz.second.first == mapGenOptions.getWidth() &&
 			sz.second.second == mapGenOptions.getHeight())

+ 3 - 1
mapeditor/windownewmap.h

@@ -11,6 +11,8 @@
 #pragma once
 
 #include <QDialog>
+
+#include "../lib/mapping/CMapHeader.h"
 #include "../lib/rmg/CMapGenOptions.h"
 
 namespace Ui
@@ -62,7 +64,7 @@ class WindowNewMap : public QDialog
 		{7, 6},
 		{8, 7}
 	};
-	
+
 	const std::map<int, std::pair<int, int>> mapSizes
 	{
 		{0, {CMapHeader::MAP_SIZE_SMALL, 	CMapHeader::MAP_SIZE_SMALL}},