Skip to content

Commit c525883

Browse files
Adjustment Faction class
1 parent 0887cd4 commit c525883

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

src/Faction.cpp

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,10 @@ Faction::Faction(const QJsonObject& factionAsObject)
1717
, techTree{ParseJsonObject(factionAsObject)}
1818
{}
1919

20-
const QString& Faction::GetShortName() const
21-
{
22-
return shortName;
23-
}
24-
25-
const QString& Faction::GetDisplayName() const
26-
{
27-
return displayName;
28-
}
29-
30-
const QString& Faction::GetDisplayNameDescription() const
31-
{
32-
return displayNameDescription;
33-
}
34-
35-
const QMap<Faction::GameObject, GameObjectTypes>& Faction::GetTechTree() const
36-
{
37-
return techTree;
38-
}
20+
const QString& Faction::GetShortName() const { return shortName; }
21+
const QString& Faction::GetDisplayName() const { return displayName; }
22+
const QString& Faction::GetDisplayNameDescription() const { return displayNameDescription; }
23+
const QMap<Faction::GameObject, GameObjectTypes>& Faction::GetTechTree() const { return techTree; }
3924

4025
const QVector<QVector<Faction::Action>> Faction::GetKeyboardLayoutsByObjectName(const QString& objName) const
4126
{
@@ -107,7 +92,5 @@ void Faction::SetHotkey(const QString& goName, const QString& actName, const QSt
10792
}
10893
}
10994

110-
bool operator < (Faction::GameObject a, Faction::GameObject b)
111-
{
112-
return a.iconName < b.iconName ? true : false;
113-
}
95+
// Method used for QMap.insert
96+
bool operator < (Faction::GameObject a, Faction::GameObject b) { return a.iconName < b.iconName ? true : false; }

0 commit comments

Comments
 (0)