Skip to content

Commit fc263f2

Browse files
Holt59Holt59
authored
Fix ambiguous Version name after semver introduction in uibase. (#34)
1 parent add901f commit fc263f2

2 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎src/fomodinstallerdialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ FomodInstallerDialog::testCondition(int, const FileCondition* condition) const
440440
.arg(trPluginStates.at(result).toLower()));
441441
}
442442

443-
namespace
443+
namespace FOMOD
444444
{
445445
class Version
446446
{
@@ -469,7 +469,7 @@ bool operator<=(Version const& lhs, Version const& rhs)
469469
return lhs.m_version <= rhs.m_version;
470470
}
471471

472-
} // namespace
472+
} // namespace FOMOD
473473

474474
std::pair<bool, QString>
475475
FomodInstallerDialog::testCondition(int, const VersionCondition* condition) const
@@ -502,7 +502,7 @@ FomodInstallerDialog::testCondition(int, const VersionCondition* condition) cons
502502
}
503503
} break;
504504
}
505-
if (Version(condition->m_RequiredVersion) <= Version(version))
505+
if (FOMOD::Version(condition->m_RequiredVersion) <= FOMOD::Version(version))
506506
return std::make_pair<bool, QString>(
507507
true, tr("Success: The required version of %1 is %2, and was detected as %3.")
508508
.arg(typeName)

‎src/installer_fomod_en.ts‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,163 +46,163 @@
4646
<message>
4747
<location filename="fomodinstallerdialog.ui" line="239"/>
4848
<location filename="fomodinstallerdialog.cpp" line="1507"/>
49-
<location filename="fomodinstallerdialog.cpp" line="1655"/>
49+
<location filename="fomodinstallerdialog.cpp" line="1652"/>
5050
<source>Next</source>
5151
<translation type="unfinished"></translation>
5252
</message>
5353
<message>
5454
<location filename="fomodinstallerdialog.ui" line="246"/>
55-
<location filename="fomodinstallerdialog.cpp" line="501"/>
55+
<location filename="fomodinstallerdialog.cpp" line="528"/>
5656
<source>Cancel</source>
5757
<translation type="unfinished"></translation>
5858
</message>
5959
<message>
60-
<location filename="fomodinstallerdialog.cpp" line="226"/>
60+
<location filename="fomodinstallerdialog.cpp" line="224"/>
6161
<source>Failed to parse %1. See console for details.</source>
6262
<translation type="unfinished"></translation>
6363
</message>
6464
<message>
65-
<location filename="fomodinstallerdialog.cpp" line="248"/>
65+
<location filename="fomodinstallerdialog.cpp" line="246"/>
6666
<source>%1 missing.</source>
6767
<translation type="unfinished"></translation>
6868
</message>
6969
<message>
70-
<location filename="fomodinstallerdialog.cpp" line="385"/>
70+
<location filename="fomodinstallerdialog.cpp" line="395"/>
7171
<source>At least one condition was successful in an &apos;OR&apos; clause!</source>
7272
<translation type="unfinished"></translation>
7373
</message>
7474
<message>
75-
<location filename="fomodinstallerdialog.cpp" line="393"/>
75+
<location filename="fomodinstallerdialog.cpp" line="404"/>
7676
<source>All conditions were successful in an &apos;AND&apos; clause!</source>
7777
<translation type="unfinished"></translation>
7878
</message>
7979
<message>
80-
<location filename="fomodinstallerdialog.cpp" line="395"/>
80+
<location filename="fomodinstallerdialog.cpp" line="407"/>
8181
<source>No conditions were successful in an &apos;OR&apos; clause!</source>
8282
<translation type="unfinished"></translation>
8383
</message>
8484
<message>
85-
<location filename="fomodinstallerdialog.cpp" line="403"/>
85+
<location filename="fomodinstallerdialog.cpp" line="418"/>
8686
<source>invalid plugin state %1</source>
8787
<translation type="unfinished"></translation>
8888
</message>
8989
<message>
90-
<location filename="fomodinstallerdialog.cpp" line="409"/>
90+
<location filename="fomodinstallerdialog.cpp" line="425"/>
9191
<source>Missing</source>
9292
<translation type="unfinished"></translation>
9393
</message>
9494
<message>
95-
<location filename="fomodinstallerdialog.cpp" line="410"/>
95+
<location filename="fomodinstallerdialog.cpp" line="426"/>
9696
<source>Inactive</source>
9797
<translation type="unfinished"></translation>
9898
</message>
9999
<message>
100-
<location filename="fomodinstallerdialog.cpp" line="411"/>
100+
<location filename="fomodinstallerdialog.cpp" line="427"/>
101101
<source>Active</source>
102102
<translation type="unfinished"></translation>
103103
</message>
104104
<message>
105-
<location filename="fomodinstallerdialog.cpp" line="416"/>
105+
<location filename="fomodinstallerdialog.cpp" line="432"/>
106106
<source>Success: The file &apos;%1&apos; was marked %2.</source>
107107
<translation type="unfinished"></translation>
108108
</message>
109109
<message>
110-
<location filename="fomodinstallerdialog.cpp" line="419"/>
110+
<location filename="fomodinstallerdialog.cpp" line="437"/>
111111
<source>Missing requirement: The file &apos;%1&apos; should be %2, but was %3!</source>
112112
<translation type="unfinished"></translation>
113113
</message>
114114
<message>
115-
<location filename="fomodinstallerdialog.cpp" line="486"/>
115+
<location filename="fomodinstallerdialog.cpp" line="507"/>
116116
<source>Success: The required version of %1 is %2, and was detected as %3.</source>
117117
<translation type="unfinished"></translation>
118118
</message>
119119
<message>
120-
<location filename="fomodinstallerdialog.cpp" line="489"/>
120+
<location filename="fomodinstallerdialog.cpp" line="513"/>
121121
<source>Missing requirement: The required version of %1 is %2, but was detected as %3.</source>
122122
<translation type="unfinished"></translation>
123123
</message>
124124
<message>
125-
<location filename="fomodinstallerdialog.cpp" line="499"/>
125+
<location filename="fomodinstallerdialog.cpp" line="526"/>
126126
<source>Missing files or folders</source>
127127
<translation type="unfinished"></translation>
128128
</message>
129129
<message>
130-
<location filename="fomodinstallerdialog.cpp" line="500"/>
130+
<location filename="fomodinstallerdialog.cpp" line="527"/>
131131
<source>Install anyway</source>
132132
<translation type="unfinished"></translation>
133133
</message>
134134
<message>
135-
<location filename="fomodinstallerdialog.cpp" line="503"/>
135+
<location filename="fomodinstallerdialog.cpp" line="530"/>
136136
<source>The following files or folders were not found in the archive. This is likely due to an incorrect FOMOD installer. This mod may not work properly.</source>
137137
<translation type="unfinished"></translation>
138138
</message>
139139
<message>
140-
<location filename="fomodinstallerdialog.cpp" line="509"/>
140+
<location filename="fomodinstallerdialog.cpp" line="535"/>
141141
<source>Folder &apos;%1&apos;.</source>
142142
<translation type="unfinished"></translation>
143143
</message>
144144
<message>
145-
<location filename="fomodinstallerdialog.cpp" line="509"/>
145+
<location filename="fomodinstallerdialog.cpp" line="535"/>
146146
<source>File &apos;%1&apos;.</source>
147147
<translation type="unfinished"></translation>
148148
</message>
149149
<message>
150-
<location filename="fomodinstallerdialog.cpp" line="653"/>
150+
<location filename="fomodinstallerdialog.cpp" line="679"/>
151151
<source>&lt;a href=&quot;%1&quot;&gt;Link&lt;/a&gt;</source>
152152
<translation type="unfinished"></translation>
153153
</message>
154154
<message>
155-
<location filename="fomodinstallerdialog.cpp" line="678"/>
155+
<location filename="fomodinstallerdialog.cpp" line="703"/>
156156
<source>unsupported order type %1</source>
157157
<translation type="unfinished"></translation>
158158
</message>
159159
<message>
160-
<location filename="fomodinstallerdialog.cpp" line="701"/>
160+
<location filename="fomodinstallerdialog.cpp" line="721"/>
161161
<source>unsupported group type %1</source>
162162
<translation type="unfinished"></translation>
163163
</message>
164164
<message>
165-
<location filename="fomodinstallerdialog.cpp" line="982"/>
165+
<location filename="fomodinstallerdialog.cpp" line="996"/>
166166
<source>All components in this group are required</source>
167167
<translation type="unfinished"></translation>
168168
</message>
169169
<message>
170-
<location filename="fomodinstallerdialog.cpp" line="1024"/>
170+
<location filename="fomodinstallerdialog.cpp" line="1036"/>
171171
<source>None</source>
172172
<translation type="unfinished"></translation>
173173
</message>
174174
<message>
175-
<location filename="fomodinstallerdialog.cpp" line="1054"/>
175+
<location filename="fomodinstallerdialog.cpp" line="1064"/>
176176
<source>Select one or more of these options:</source>
177177
<translation type="unfinished"></translation>
178178
</message>
179179
<message>
180-
<location filename="fomodinstallerdialog.cpp" line="1386"/>
180+
<location filename="fomodinstallerdialog.cpp" line="1381"/>
181181
<source>The flag &apos;%1&apos; matched &apos;%2&apos;</source>
182182
<translation type="unfinished"></translation>
183183
</message>
184184
<message>
185-
<location filename="fomodinstallerdialog.cpp" line="1388"/>
185+
<location filename="fomodinstallerdialog.cpp" line="1385"/>
186186
<source>The flag &apos;%1&apos; did not match &apos;%2&apos;</source>
187187
<translation type="unfinished"></translation>
188188
</message>
189189
<message>
190-
<location filename="fomodinstallerdialog.cpp" line="1397"/>
190+
<location filename="fomodinstallerdialog.cpp" line="1396"/>
191191
<source>The condition was not matched and is empty.</source>
192192
<translation type="unfinished"></translation>
193193
</message>
194194
<message>
195-
<location filename="fomodinstallerdialog.cpp" line="1398"/>
195+
<location filename="fomodinstallerdialog.cpp" line="1397"/>
196196
<source>The value exists but was not matched.</source>
197197
<translation type="unfinished"></translation>
198198
</message>
199199
<message>
200-
<location filename="fomodinstallerdialog.cpp" line="1479"/>
200+
<location filename="fomodinstallerdialog.cpp" line="1478"/>
201201
<source>Disabled</source>
202202
<translation type="unfinished"></translation>
203203
</message>
204204
<message>
205-
<location filename="fomodinstallerdialog.cpp" line="1481"/>
205+
<location filename="fomodinstallerdialog.cpp" line="1480"/>
206206
<source>This button is disabled because the following group(s) need a selection: </source>
207207
<translation type="unfinished"></translation>
208208
</message>
@@ -232,25 +232,25 @@
232232
<translation type="unfinished"></translation>
233233
</message>
234234
<message>
235-
<location filename="fomodinstallerdialog.cpp" line="1594"/>
235+
<location filename="fomodinstallerdialog.cpp" line="1595"/>
236236
<source>You may be experiencing instability in combination with other installed plugins</source>
237237
<translation type="unfinished"></translation>
238238
</message>
239239
</context>
240240
<context>
241241
<name>InstallerFomod</name>
242242
<message>
243-
<location filename="installerfomod.cpp" line="43"/>
243+
<location filename="installerfomod.cpp" line="38"/>
244244
<source>Installer for xml based fomod archives.</source>
245245
<translation type="unfinished"></translation>
246246
</message>
247247
<message>
248-
<location filename="installerfomod.cpp" line="53"/>
248+
<location filename="installerfomod.cpp" line="48"/>
249249
<source>Fomod Installer</source>
250250
<translation type="unfinished"></translation>
251251
</message>
252252
<message>
253-
<location filename="installerfomod.cpp" line="251"/>
253+
<location filename="installerfomod.cpp" line="252"/>
254254
<source>Installation as fomod failed: %1</source>
255255
<translation type="unfinished"></translation>
256256
</message>
@@ -261,7 +261,7 @@
261261
</message>
262262
<message>
263263
<location filename="installerfomod.cpp" line="279"/>
264-
<location filename="installerfomod.cpp" line="290"/>
264+
<location filename="installerfomod.cpp" line="291"/>
265265
<source>invalid problem key %1</source>
266266
<translation type="unfinished"></translation>
267267
</message>

0 commit comments

Comments
 (0)