Standardize on QVector as the main container for various consts.

Fynx · Jul 19, 2014 · aa965ed · aa965ed
1 parent f9d3f39
commit aa965ed
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/src/BTCommon/Rules.cpp b/src/BTCommon/Rules.cpp
@@ -22,7 +22,6 @@ This file is part of BTech Project.
 
 BTech::GameVersion Rules::version;
 QString Rules::description;
-QList <BTech::GamePhase> Rules::allowedPhases;
 
 void Rules::setVersion(const BTech::GameVersion newVersion)
 {
@@ -44,7 +43,7 @@ QString Rules::getDescription()
 	return description;
 }
 
-QList <BTech::GamePhase> Rules::getAllowedPhases()
+QVector <BTech::GamePhase> Rules::getAllowedPhases()
 {
 	return BTech::versionToPhaseList[getVersion()];
 }
diff --git a/src/BTCommon/Rules.h b/src/BTCommon/Rules.h
@@ -37,7 +37,7 @@ Q_OBJECT;
 	static BTech::GameVersion getVersion();
 	static void setDescription(const QString &description);
 	static QString getDescription();
-	static QList <BTech::GamePhase> getAllowedPhases();
+	static QVector <BTech::GamePhase> getAllowedPhases();
 
 private:
 	Rules() = delete;
@@ -48,7 +48,6 @@ Q_OBJECT;
 
 	static BTech::GameVersion version;
 	static QString description;
-	static QList <BTech::GamePhase> allowedPhases;
 };
 
 #endif // RULES_H
diff --git a/src/BTCommon/Utils.cpp b/src/BTCommon/Utils.cpp
@@ -43,7 +43,7 @@ const BiHash <BTech::GameVersion, QString> BTech::gameVersionStringChange {
 	{GameVersion::AdvancedBattleDroids, Strings::AdvancedBattleDroids},
 };
 
-const QHash <BTech::GameVersion, QList <BTech::GamePhase> > BTech::versionToPhaseList {
+const QHash <BTech::GameVersion, QVector <BTech::GamePhase> > BTech::versionToPhaseList {
 	{GameVersion::BasicBattleDroids,
 		{GamePhase::Initiative, GamePhase::Movement, GamePhase::Combat, GamePhase::End}
 	},
@@ -322,9 +322,9 @@ QString BTech::General::bashColorString(const QString &string, const QColor& col
 		{Qt::yellow, "33m"},
 		{Qt::blue,   "34m"},
 	};
-	
+
 	static const QString pref = QString("\e[");
-	
+
 	if (colorBashValue.contains(color))
 		return pref + colorBashValue[color] + string + pref + colorBashValue[Qt::white];
 	else

diff --git a/src/BTCommon/Utils.h b/src/BTCommon/Utils.h
@@ -44,7 +44,7 @@ namespace BTech {
 		End            =  7
 	};
 
-	static const QList <GamePhase> phases {
+	static const QVector <GamePhase> phases {
 		GamePhase::Initiative,
 		GamePhase::Movement,
 		GamePhase::Reaction,
@@ -65,14 +65,14 @@ namespace BTech {
 		AdvancedBattleDroids,
 	};
 
-	static const QList <GameVersion> gameVersions {
+	static const QVector <GameVersion> gameVersions {
 		GameVersion::BasicBattleDroids,
 		GameVersion::AdvancedBattleDroids
 	};
 
 	extern const BiHash <GameVersion, QString> gameVersionStringChange;
 
-	extern const QHash <GameVersion, QList <GamePhase> > versionToPhaseList;
+	extern const QHash <GameVersion, QVector <GamePhase> > versionToPhaseList;
 
 	QDataStream & operator << (QDataStream &out, const GameVersion &rules);
 	QDataStream & operator >> (QDataStream &in, GameVersion &rules);
@@ -160,20 +160,20 @@ namespace BTech {
 		OutOfRange = 4
 	};
 
-	static const std::array <Range, 5> ranges {
+	static const QVector <Range> ranges {
 		Range::Contact,
 		Range::Short,
 		Range::Medium,
 		Range::Long,
 		Range::OutOfRange,
 	};
-	static const std::array <Range, 4> attackRanges {
+	static const QVector <Range> attackRanges {
 		Range::Contact,
 		Range::Short,
 		Range::Medium,
 		Range::Long,
 	};
-	static const std::array <Range, 3> shootRanges {
+	static const QVector <Range> shootRanges {
 		Range::Short,
 		Range::Medium,
 		Range::Long,
@@ -240,7 +240,7 @@ namespace BTech {
 		TurnLeft,
 	};
 
-	const QList <MovementAction> movementActions = {
+	const QVector <MovementAction> movementActions = {
 		MovementAction::Idle,
 		MovementAction::Walk,
 		MovementAction::Run,
@@ -265,7 +265,7 @@ namespace BTech {
 		Charge
 	};
 
-	const QList <CombatAction> combatActions = {
+	const QVector <CombatAction> combatActions = {
 		CombatAction::Idle,
 		CombatAction::SimpleAttack,
 		CombatAction::WeaponAttack,
@@ -291,7 +291,7 @@ namespace BTech {
 	*/
 	namespace General {
 		QString indexString(const QString &string, const QList <QString> &existing);
-		
+
 		QString bashColorString(const QString &string, const QColor &color);
 
 		// world timer

diff --git a/src/BTCommon/WeaponBase.cpp b/src/BTCommon/WeaponBase.cpp
@@ -97,7 +97,7 @@ int WeaponBase::getRangeModifier(int distance) const
 
 int WeaponBase::getRangeModifier(BTech::Range range) const
 {
-	return rangeModifier[toUnderlying(range)];
+	return rangeModifier[range];
 }
 
 BTech::Range WeaponBase::distanceToRange(int distance) const

diff --git a/src/BTCommon/WeaponBase.h b/src/BTCommon/WeaponBase.h
@@ -113,7 +113,7 @@ class WeaponBase
 
 	BTech::WeaponType type;
 
-	static const std::array <int, BTech::ranges.size()> rangeModifier;
+	static const QHash <BTech::Range, int> rangeModifier;
 	int minRange;
 	QHash <BTech::Range, int> maxRange;
 
@@ -142,7 +142,7 @@ namespace BTech {
 
 	extern const QHash <Modifier, QString> modifierStringChange;
 
-	static const std::array <Modifier, 7> modifiers {
+	static const QVector <Modifier> modifiers {
 		Modifier::Base,
 		Modifier::Range,
 		Modifier::Direction,