Skip to content

Commit 8160b28

Browse files
JamirasJamiras
committed
move TriggerValidation to data/util
1 parent c4b16bc commit 8160b28

15 files changed

Lines changed: 48 additions & 54 deletions

‎src/devkit/RADevKit.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<ClCompile Include="data\models\MemoryNotesModel.cpp" />
7676
<ClCompile Include="data\models\MemoryRegionsModel.cpp" />
7777
<ClCompile Include="data\models\RichPresenceModel.cpp" />
78-
<ClCompile Include="data\models\TriggerValidation.cpp" />
7978
<ClCompile Include="data\util\IndirectNoteResolver.cpp" />
79+
<ClCompile Include="data\util\TriggerValidation.cpp" />
8080
<ClCompile Include="data\Value.cpp" />
8181
<ClCompile Include="services\Http.cpp" />
8282
<ClCompile Include="ui\ImageReference.cpp" />
@@ -110,9 +110,9 @@
110110
<ClInclude Include="data\models\MemoryNotesModel.hh" />
111111
<ClInclude Include="data\models\MemoryRegionsModel.hh" />
112112
<ClInclude Include="data\models\RichPresenceModel.hh" />
113-
<ClInclude Include="data\models\TriggerValidation.hh" />
114113
<ClInclude Include="data\NotifyTargetSet.hh" />
115114
<ClInclude Include="data\util\IndirectNoteResolver.hh" />
115+
<ClInclude Include="data\util\TriggerValidation.hh" />
116116
<ClInclude Include="data\Value.hh" />
117117
<ClInclude Include="services\Http.hh" />
118118
<ClInclude Include="services\IClock.hh" />

‎src/devkit/RADevKit.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@
183183
<ClInclude Include="data\models\MemoryNotesModel.hh">
184184
<Filter>data\models</Filter>
185185
</ClInclude>
186-
<ClInclude Include="data\models\TriggerValidation.hh">
187-
<Filter>data\models</Filter>
188-
</ClInclude>
189186
<ClInclude Include="ui\IImageRepository.hh">
190187
<Filter>ui</Filter>
191188
</ClInclude>
@@ -207,6 +204,9 @@
207204
<ClInclude Include="data\util\IndirectNoteResolver.hh">
208205
<Filter>data\util</Filter>
209206
</ClInclude>
207+
<ClInclude Include="data\util\TriggerValidation.hh">
208+
<Filter>data\util</Filter>
209+
</ClInclude>
210210
</ItemGroup>
211211
<ItemGroup>
212212
<ClCompile Include="util\GSL.cpp">
@@ -275,9 +275,6 @@
275275
<ClCompile Include="data\models\MemoryNotesModel.cpp">
276276
<Filter>data\models</Filter>
277277
</ClCompile>
278-
<ClCompile Include="data\models\TriggerValidation.cpp">
279-
<Filter>data\models</Filter>
280-
</ClCompile>
281278
<ClCompile Include="ui\ImageReference.cpp">
282279
<Filter>ui</Filter>
283280
</ClCompile>
@@ -293,5 +290,8 @@
293290
<ClCompile Include="data\util\IndirectNoteResolver.cpp">
294291
<Filter>data\util</Filter>
295292
</ClCompile>
293+
<ClCompile Include="data\util\TriggerValidation.cpp">
294+
<Filter>data\util</Filter>
295+
</ClCompile>
296296
</ItemGroup>
297297
</Project>

‎src/devkit/data/models/AchievementModel.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "util/Log.hh"
99

1010
#include "data/models/LocalBadgesModel.hh"
11-
#include "data/models/TriggerValidation.hh"
11+
#include "data/util/TriggerValidation.hh"
1212

1313
#include "services/ServiceLocator.hh"
1414

@@ -169,7 +169,7 @@ bool AchievementModel::ValidateAsset(std::wstring& sError)
169169
return false;
170170
}
171171

172-
return TriggerValidation::Validate(sTrigger, sError, AssetType::Achievement);
172+
return ra::data::util::TriggerValidation::TriggerValidation::Validate(sTrigger, sError, AssetType::Achievement);
173173
}
174174

175175
void AchievementModel::DoFrame()

‎src/devkit/data/models/LeaderboardModel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "context/IRcClient.hh"
44

5-
#include "data/models/TriggerValidation.hh"
5+
#include "data/util/TriggerValidation.hh"
66

77
#include "services/ServiceLocator.hh"
88

@@ -133,19 +133,19 @@ bool LeaderboardModel::ValidateAsset(std::wstring& sError)
133133
return false;
134134
}
135135

136-
if (!TriggerValidation::Validate(sStartTrigger, sError, AssetType::Leaderboard))
136+
if (!ra::data::util::TriggerValidation::Validate(sStartTrigger, sError, AssetType::Leaderboard))
137137
{
138138
sError.insert(0, L"Start: ");
139139
return false;
140140
}
141141

142-
if (!TriggerValidation::Validate(sCancelTrigger, sError, AssetType::Leaderboard))
142+
if (!ra::data::util::TriggerValidation::Validate(sCancelTrigger, sError, AssetType::Leaderboard))
143143
{
144144
sError.insert(0, L"Cancel: ");
145145
return false;
146146
}
147147

148-
if (!TriggerValidation::Validate(sSubmitTrigger, sError, AssetType::Leaderboard))
148+
if (!ra::data::util::TriggerValidation::Validate(sSubmitTrigger, sError, AssetType::Leaderboard))
149149
{
150150
sError.insert(0, L"Submit: ");
151151
return false;

‎src/devkit/data/models/TriggerValidation.hh‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/devkit/data/models/TriggerValidation.cpp renamed to src/devkit/data/util/TriggerValidation.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace ra {
1717
namespace data {
18-
namespace models {
18+
namespace util {
1919

2020
static bool ValidateLeaderboardCondSet(const rc_condset_t* pCondSet, std::wstring& sError)
2121
{
@@ -195,7 +195,7 @@ static bool ValidateMemoryNotes(const rc_trigger_t* pTrigger, std::wstring& sErr
195195
return true;
196196
}
197197

198-
bool TriggerValidation::Validate(const std::string& sTrigger, std::wstring& sError, AssetType nType)
198+
bool TriggerValidation::Validate(const std::string& sTrigger, std::wstring& sError, ra::data::models::AssetType nType)
199199
{
200200
rc_preparse_state_t preparse;
201201
rc_init_preparse_state(&preparse);
@@ -254,7 +254,7 @@ bool TriggerValidation::Validate(const std::string& sTrigger, std::wstring& sErr
254254

255255
if (nResult)
256256
{
257-
if (nType == AssetType::Leaderboard)
257+
if (nType == ra::data::models::AssetType::Leaderboard)
258258
{
259259
if (!ValidateLeaderboardTrigger(&trigger->trigger, sError))
260260
return false;
@@ -273,6 +273,6 @@ bool TriggerValidation::Validate(const std::string& sTrigger, std::wstring& sErr
273273
}
274274
}
275275

276-
} // namespace models
276+
} // namespace util
277277
} // namespace data
278278
} // namespace ra

‎src/devkit/data/util/TriggerValidation.hh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#ifndef RA_DATA_UTIL_TRIGGERVALIDATION_H
2+
#define RA_DATA_UTIL_TRIGGERVALIDATION_H
3+
#pragma once
4+
5+
#include "data/models/AssetModelBase.hh"
6+
7+
namespace ra {
8+
namespace data {
9+
namespace util {
10+
11+
class TriggerValidation
12+
{
13+
public:
14+
static bool Validate(const std::string& sTrigger, std::wstring& sError, ra::data::models::AssetType nType);
15+
};
16+
17+
} // namespace util
18+
} // namespace data
19+
} // namespace ra
20+
21+
#endif RA_DATA_UTIL_TRIGGERVALIDATION_H

‎src/ui/viewmodels/MemoryBookmarksViewModel.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "context\IEmulatorMemoryContext.hh"
88

99
#include "data\Types.hh"
10-
#include "data\models\TriggerValidation.hh"
1110

1211
#include "services\AchievementLogicSerializer.hh"
1312
#include "services\FrameEventQueue.hh"

‎src/ui/viewmodels/MemoryWatchListViewModel.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "data\Types.hh"
88
#include "data\context\EmulatorContext.hh"
9-
#include "data\models\TriggerValidation.hh"
109

1110
#include "services\AchievementLogicSerializer.hh"
1211
#include "services\FrameEventQueue.hh"

‎src/ui/viewmodels/MemoryWatchViewModel.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "data\Types.hh"
1111
#include "data\context\EmulatorContext.hh"
12-
#include "data\models\TriggerValidation.hh"
1312

1413
#include "services\AchievementRuntime.hh"
1514
#include "services\IConfiguration.hh"

0 commit comments

Comments
 (0)