1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00

Fix: licenses, pragma guards, StdInc

This commit is contained in:
Evgeny Malygin
2024-03-29 07:48:52 +02:00
committed by GitHub
parent 54405e33bc
commit 25125f96da
54 changed files with 282 additions and 39 deletions

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"

View File

@@ -1,6 +1,3 @@
namespace Nullkiller
{
/* /*
* Build.cpp, part of VCMI engine * Build.cpp, part of VCMI engine
* *
@@ -23,6 +20,8 @@ namespace Nullkiller
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"
namespace Nullkiller
{
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;
extern boost::thread_specific_ptr<AIGateway> ai; extern boost::thread_specific_ptr<AIGateway> ai;

View File

@@ -1,6 +1,3 @@
namespace Nullkiller
{
/* /*
* Build.h, part of VCMI engine * Build.h, part of VCMI engine
* *
@@ -14,6 +11,9 @@ namespace Nullkiller
#include "CGoal.h" #include "CGoal.h"
namespace Nullkiller
{
struct HeroPtr; struct HeroPtr;
class AIGateway; class AIGateway;
class FuzzyHelper; class FuzzyHelper;

View File

@@ -1,6 +1,3 @@
namespace Nullkiller
{
/* /*
* GatherArmy.cpp, part of VCMI engine * GatherArmy.cpp, part of VCMI engine
* *
@@ -22,6 +19,8 @@ namespace Nullkiller
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"
namespace Nullkiller
{
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;
extern boost::thread_specific_ptr<AIGateway> ai; extern boost::thread_specific_ptr<AIGateway> ai;

View File

@@ -1,6 +1,3 @@
namespace Nullkiller
{
/* /*
* GatherArmy.h, part of VCMI engine * GatherArmy.h, part of VCMI engine
* *
@@ -14,6 +11,9 @@ namespace Nullkiller
#include "CGoal.h" #include "CGoal.h"
namespace Nullkiller
{
struct HeroPtr; struct HeroPtr;
class AIGateway; class AIGateway;
class FuzzyHelper; class FuzzyHelper;

View File

@@ -1 +1,10 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"
VCMI_LIB_USING_NAMESPACE VCMI_LIB_USING_NAMESPACE

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"

View File

@@ -1,5 +1,5 @@
/* /*
* AIhelper.h, part of VCMI engine * AIhelper.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

View File

@@ -1,3 +1,12 @@
/*
* MapObjectsEvaluator.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"
#include "MapObjectsEvaluator.h" #include "MapObjectsEvaluator.h"
#include "../../lib/GameConstants.h" #include "../../lib/GameConstants.h"

View File

@@ -1 +1,10 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"

View File

@@ -7,9 +7,9 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#include "StdInc.h"
#include "CFocusableHelper.h" #include "CFocusableHelper.h"
#include "../Global.h" #include "../Global.h"
#include "StdInc.h"
#include "widgets/TextControls.h" #include "widgets/TextControls.h"
void removeFocusFromActiveInput() void removeFocusFromActiveInput()

View File

@@ -7,5 +7,6 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
void removeFocusFromActiveInput(); void removeFocusFromActiveInput();

View File

@@ -7,8 +7,8 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#include "Global.h"
#include "StdInc.h" #include "StdInc.h"
#include "Global.h"
#include "Client.h" #include "Client.h"
#include "CGameInfo.h" #include "CGameInfo.h"

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../Global.h" #include "../Global.h"

View File

@@ -1,5 +1,5 @@
/* /*
* FramerateManager.h, part of VCMI engine * FramerateManager.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

View File

@@ -7,6 +7,7 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>

View File

@@ -7,8 +7,8 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#import "startSDL.h"
#include "StdInc.h" #include "StdInc.h"
#import "startSDL.h"
#import "GameChatKeyboardHandler.h" #import "GameChatKeyboardHandler.h"
#include "../Global.h" #include "../Global.h"

View File

@@ -1,5 +1,5 @@
/* /*
* ICursor.h, part of VCMI engine * Colors.h, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

View File

@@ -1 +1,10 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../Global.h" #include "../Global.h"

View File

@@ -9,18 +9,10 @@
*/ */
#pragma once #pragma once
#include "StdInc.h"
#include <QVariantMap> #include <QVariantMap>
#include <QVariant> #include <QVariant>
#include <QVector> #include <QVector>
VCMI_LIB_NAMESPACE_BEGIN
class JsonNode;
VCMI_LIB_NAMESPACE_END
namespace ModStatus namespace ModStatus
{ {
enum EModStatus enum EModStatus

View File

@@ -10,7 +10,6 @@
#pragma once #pragma once
#include "StdInc.h"
#include <atomic> #include <atomic>
namespace Load namespace Load

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../Global.h" #include "../Global.h"

View File

@@ -1,5 +1,5 @@
/* /*
* CBattleInfoCallback.h, part of VCMI engine * PossiblePlayerBattleAction.h, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *
@@ -7,6 +7,7 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#include "../GameConstants.h" #include "../GameConstants.h"

View File

@@ -1,4 +1,3 @@
/* /*
* IBonusBearer.h, part of VCMI engine * IBonusBearer.h, part of VCMI engine
* *

View File

@@ -1,5 +1,5 @@
/* /*
* CModVersion.h, part of VCMI engine * CModVersion.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

View File

@@ -7,6 +7,7 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#include "ProxyCaster.h" #include "ProxyCaster.h"
#include "../battle/BattleHex.h" #include "../battle/BattleHex.h"

View File

@@ -8,10 +8,10 @@
* *
*/ */
#pragma once #pragma once
#include "../int3.h" #include "../int3.h"
#include "../GameConstants.h" #include "../GameConstants.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

View File

@@ -1,3 +1,12 @@
/*
* DateUtils.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"
#include <vstd/DateUtils.h> #include <vstd/DateUtils.h>

View File

@@ -1,3 +1,12 @@
/*
* StringUtils.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"
#include <vstd/StringUtils.h> #include <vstd/StringUtils.h>

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1 +1,10 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../Global.h" #include "../Global.h"

View File

@@ -7,8 +7,8 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#include <QApplication>
#include "StdInc.h" #include "StdInc.h"
#include <QApplication>
#include "mainwindow.h" #include "mainwindow.h"
int main(int argc, char * argv[]) int main(int argc, char * argv[])

View File

@@ -1,5 +1,5 @@
/* /*
* victoryconditions.h, part of VCMI engine * victoryconditions.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,3 +1,12 @@
/*
* StdInc.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "../../Global.h" #include "../../Global.h"

View File

@@ -7,6 +7,7 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#include "../lib/spells/ISpellMechanics.h" #include "../lib/spells/ISpellMechanics.h"

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -1,2 +1,11 @@
/*
* StdInc.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// Creates the precompiled header // Creates the precompiled header
#include "StdInc.h" #include "StdInc.h"

View File

@@ -7,12 +7,12 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#include "../../../lib/mapping/CMap.h" #include "../../../lib/mapping/CMap.h"
#include "../../../lib/rmg/CMapGenOptions.h" #include "../../../lib/rmg/CMapGenOptions.h"
#include "../../../lib/rmg/CMapGenerator.h" #include "../../../lib/rmg/CMapGenerator.h"
#pragma once
class ZoneOptionsFake : public rmg::ZoneOptions class ZoneOptionsFake : public rmg::ZoneOptions
{ {
public: public:

View File

@@ -9,8 +9,6 @@
*/ */
#include "StdInc.h" #include "StdInc.h"
#include "StdInc.h"
#include "TargetConditionItemFixture.h" #include "TargetConditionItemFixture.h"
namespace test namespace test

View File

@@ -1,3 +1,12 @@
/*
* mock_ResourceManager.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"
#include "mock_ResourceManager.h" #include "mock_ResourceManager.h"

View File

@@ -1,3 +1,12 @@
/*
* mock_ResourceManager.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#pragma once #pragma once
#include "gtest/gtest.h" #include "gtest/gtest.h"