Skip to content

Commit b200f54

Browse files
ElTh0r0ElTh0r0
committed
m: Tpl
1 parent d5f85ab commit b200f54

File tree

2 files changed

+58
-95
lines changed

2 files changed

+58
-95
lines changed

‎application/parser/provisionaltplparser.cpp

+57-94
Original file line numberDiff line numberDiff line change
@@ -55,183 +55,139 @@ auto ProvisionalTplParser::parseTpl(const QStringList &sListArgs,
5555

5656
QStringList sArgs = sListArgs;
5757
if (!sArgs.isEmpty()) {
58-
if (sArgs[0].toLower() == QString::fromUtf8("Fortgeschritten").toLower()) {
59-
return ProvisionalTplParser::parseAdvanced();
58+
QString sTemplate = sArgs[0].trimmed().toLower();
59+
sArgs.removeFirst();
60+
61+
if (sTemplate == QString::fromUtf8("Fortgeschritten").toLower()) {
62+
return ProvisionalTplParser::parseAdvanced(sArgs);
6063
}
61-
if (sArgs[0].toLower() == QString::fromUtf8("Archiviert").toLower()) {
62-
sArgs.removeFirst();
64+
if (sTemplate == QString::fromUtf8("Archiviert").toLower()) {
6365
return ProvisionalTplParser::parseArchived(sArgs);
6466
}
65-
if (sArgs[0].toLower() == QString::fromUtf8("Befehl").toLower()) {
66-
sArgs.removeFirst();
67+
if (sTemplate == QString::fromUtf8("Befehl").toLower()) {
6768
return ProvisionalTplParser::parseBash(sArgs);
6869
}
69-
if (sArgs[0].toLower() == QString::fromUtf8("Builddeps").toLower()) {
70-
sArgs.removeFirst();
70+
if (sTemplate == QString::fromUtf8("Builddeps").toLower()) {
7171
return ProvisionalTplParser::parseBuilddeps(sArgs);
7272
}
73-
if (sArgs[0].toLower() == QString::fromUtf8("Code").toLower()) {
74-
sArgs.removeFirst();
73+
if (sTemplate == QString::fromUtf8("Code").toLower()) {
7574
return ProvisionalTplParser::parseCode(sArgs);
7675
}
77-
if (sArgs[0].toLower() == QString::fromUtf8("Kopie").toLower()) {
78-
sArgs.removeFirst();
76+
if (sTemplate == QString::fromUtf8("Kopie").toLower()) {
7977
return ProvisionalTplParser::parseCopy(sArgs);
8078
}
81-
if (sArgs[0].toLower() == QString::fromUtf8("Experten").toLower()) {
82-
sArgs.removeFirst();
79+
if (sTemplate == QString::fromUtf8("Experten").toLower()) {
8380
return ProvisionalTplParser::parseExperts(sArgs);
8481
}
85-
if (sArgs[0].toLower() == QString::fromUtf8("Fehlerhaft").toLower()) {
86-
sArgs.removeFirst();
82+
if (sTemplate == QString::fromUtf8("Fehlerhaft").toLower()) {
8783
return ProvisionalTplParser::parseFixme(sArgs);
8884
}
89-
if (sArgs[0].toLower() == QString::fromUtf8("Fremdquelle-auth").toLower()) {
90-
sArgs.removeFirst();
85+
if (sTemplate == QString::fromUtf8("Fremdquelle-auth").toLower()) {
9186
return ProvisionalTplParser::parseForeignAuth(sArgs);
9287
}
93-
if (sArgs[0].toLower() == QString::fromUtf8("Fremdquelle").toLower()) {
94-
sArgs.removeFirst();
88+
if (sTemplate == QString::fromUtf8("Fremdquelle").toLower()) {
9589
return ProvisionalTplParser::parseForeignSource(sArgs);
9690
}
97-
if (sArgs[0].toLower() == QString::fromUtf8("Fremdpaket").toLower()) {
98-
sArgs.removeFirst();
91+
if (sTemplate == QString::fromUtf8("Fremdpaket").toLower()) {
9992
return ProvisionalTplParser::parseForeignPackage(sArgs);
10093
}
101-
if (sArgs[0].toLower() == QString::fromUtf8("Fremd").toLower()) {
102-
sArgs.removeFirst();
94+
if (sTemplate == QString::fromUtf8("Fremd").toLower()) {
10395
return ProvisionalTplParser::parseForeignWarning(sArgs);
10496
}
105-
if (sArgs[0].toLower() == QString::fromUtf8("Howto").toLower()) {
106-
sArgs.removeFirst();
97+
if (sTemplate == QString::fromUtf8("Howto").toLower()) {
10798
return ProvisionalTplParser::parseHowto(sArgs);
10899
}
109-
if (sArgs[0].toLower() == QString::fromUtf8("Icon-Übersicht").toLower()) {
110-
sArgs.removeFirst();
100+
if (sTemplate == QString::fromUtf8("Icon-Übersicht").toLower()) {
111101
return ProvisionalTplParser::parseIconOverview(sArgs);
112102
}
113-
if (sArgs[0].toLower() == QString::fromUtf8("IkhayaAutor").toLower()) {
114-
sArgs.removeFirst();
103+
if (sTemplate == QString::fromUtf8("IkhayaAutor").toLower()) {
115104
return ProvisionalTplParser::parseIkhayaAuthor(sArgs);
116105
}
117-
if (sArgs[0].toLower() == QString::fromUtf8("Ikhaya-Award").toLower()) {
118-
sArgs.removeFirst();
106+
if (sTemplate == QString::fromUtf8("Ikhaya-Award").toLower()) {
119107
return ProvisionalTplParser::parseIkhayaAward(sArgs);
120108
}
121-
if (sArgs[0].toLower() == QString::fromUtf8("Ikhayabild").toLower()) {
122-
sArgs.removeFirst();
109+
if (sTemplate == QString::fromUtf8("Ikhayabild").toLower()) {
123110
return ProvisionalTplParser::parseIkhayaImage(sArgs);
124111
}
125-
if (sArgs[0].toLower() ==
126-
QString::fromUtf8("Ikhaya-Projektvorstellung").toLower()) {
127-
sArgs.removeFirst();
112+
if (sTemplate == QString::fromUtf8("Ikhaya-Projektvorstellung").toLower()) {
128113
return ProvisionalTplParser::parseIkhayaProjectPresentation();
129114
}
130-
if (sArgs[0].toLower() == QString::fromUtf8("Bildersammlung").toLower()) {
131-
sArgs.removeFirst();
115+
if (sTemplate == QString::fromUtf8("Bildersammlung").toLower()) {
132116
return this->parseImageCollect(sArgs);
133117
}
134-
if (sArgs[0].toLower() == QString::fromUtf8("Bildunterschrift").toLower()) {
135-
sArgs.removeFirst();
118+
if (sTemplate == QString::fromUtf8("Bildunterschrift").toLower()) {
136119
return this->parseImageSub(sArgs);
137120
}
138-
if (sArgs[0].toLower() == QString::fromUtf8("Ausbaufähig").toLower()) {
139-
sArgs.removeFirst();
121+
if (sTemplate == QString::fromUtf8("Ausbaufähig").toLower()) {
140122
return ProvisionalTplParser::parseImprovable(sArgs);
141123
}
142-
if (sArgs[0].toLower() == QString::fromUtf8("Infobox").toLower()) {
143-
sArgs.removeFirst();
124+
if (sTemplate == QString::fromUtf8("Infobox").toLower()) {
144125
return ProvisionalTplParser::parseInfobox(sArgs);
145126
}
146-
if (sArgs[0].trimmed().toLower() == QString::fromUtf8("Tasten").toLower()) {
147-
sArgs.removeFirst();
127+
if (sTemplate == QString::fromUtf8("Tasten").toLower()) {
148128
return ProvisionalTplParser::parseKeys(sArgs);
149129
}
150-
if (sArgs[0].trimmed().toLower() == QString::fromUtf8("Wissen").toLower()) {
151-
sArgs.removeFirst();
130+
if (sTemplate == QString::fromUtf8("Wissen").toLower()) {
152131
return ProvisionalTplParser::parseKnowledge(sArgs);
153132
}
154-
if (sArgs[0].toLower() == QString::fromUtf8("Verlassen").toLower()) {
155-
sArgs.removeFirst();
133+
if (sTemplate == QString::fromUtf8("Verlassen").toLower()) {
156134
return ProvisionalTplParser::parseLeft(sArgs);
157135
}
158-
if (sArgs[0].toLower() == QString::fromUtf8("Hinweis").toLower()) {
159-
sArgs.removeFirst();
136+
if (sTemplate == QString::fromUtf8("Hinweis").toLower()) {
160137
return ProvisionalTplParser::parseNotice(sArgs);
161138
}
162-
if (sArgs[0].toLower() == QString::fromUtf8("OBS").toLower()) {
163-
sArgs.removeFirst();
139+
if (sTemplate == QString::fromUtf8("OBS").toLower()) {
164140
return ProvisionalTplParser::parseOBS(sArgs);
165141
}
166-
if (sArgs[0].toLower() == QString::fromUtf8("Uebersicht").toLower()) {
167-
sArgs.removeFirst();
142+
if (sTemplate == QString::fromUtf8("Uebersicht").toLower()) {
168143
return ProvisionalTplParser::parseOverview(sArgs);
169144
}
170-
if (sArgs[0].toLower() == QString::fromUtf8("Uebersicht2").toLower()) {
171-
sArgs.removeFirst();
145+
if (sTemplate == QString::fromUtf8("Uebersicht2").toLower()) {
172146
return ProvisionalTplParser::parseOverview2(sArgs);
173147
}
174-
if (sArgs[0].toLower() == QString::fromUtf8("Pakete").toLower()) {
175-
sArgs.removeFirst();
148+
if (sTemplate == QString::fromUtf8("Pakete").toLower()) {
176149
return ProvisionalTplParser::parsePackage(sArgs);
177150
}
178-
if (sArgs[0].toLower() == QString::fromUtf8("PipInstallation").toLower()) {
179-
sArgs.removeFirst();
151+
if (sTemplate == QString::fromUtf8("PipInstallation").toLower()) {
180152
return this->parsePipInstall(sArgs);
181153
}
182-
if (sArgs[0].toLower() == QString::fromUtf8("PipxInstallation").toLower()) {
183-
sArgs.removeFirst();
154+
if (sTemplate == QString::fromUtf8("PipxInstallation").toLower()) {
184155
return this->parsePipxInstall(sArgs);
185156
}
186-
if (sArgs[0].toLower() ==
187-
QString::fromUtf8("Paketinstallation").toLower()) {
188-
sArgs.removeFirst();
157+
if (sTemplate == QString::fromUtf8("Paketinstallation").toLower()) {
189158
return ProvisionalTplParser::parsePkgInstall(sArgs);
190159
}
191-
if (sArgs[0].trimmed().toLower() ==
192-
QString::fromUtf8("Installbutton").toLower()) {
193-
sArgs.removeFirst();
160+
if (sTemplate == QString::fromUtf8("Installbutton").toLower()) {
194161
return this->parsePkgInstallBut(sArgs);
195162
}
196-
if (sArgs[0].toLower() == QString::fromUtf8("PPA").toLower()) {
197-
sArgs.removeFirst();
163+
if (sTemplate == QString::fromUtf8("PPA").toLower()) {
198164
return ProvisionalTplParser::parsePPA(sArgs);
199165
}
200-
if (sArgs[0].toLower() == QString::fromUtf8("Projekte").toLower()) {
201-
sArgs.removeFirst();
166+
if (sTemplate == QString::fromUtf8("Projekte").toLower()) {
202167
return ProvisionalTplParser::parseProjects(sArgs);
203168
}
204-
if (sArgs[0].toLower() == QString::fromUtf8("Seitenleiste").toLower()) {
205-
sArgs.removeFirst();
169+
if (sTemplate == QString::fromUtf8("Seitenleiste").toLower()) {
206170
return ProvisionalTplParser::parseSidebar(sArgs);
207171
}
208-
if (sArgs[0].toLower() == QString::fromUtf8("StatusIcon").toLower()) {
209-
sArgs.removeFirst();
172+
if (sTemplate == QString::fromUtf8("StatusIcon").toLower()) {
210173
return ProvisionalTplParser::parseStatusIcon(sArgs);
211174
}
212-
if (sArgs[0].toLower() == QString::fromUtf8("Tabelle").toLower()) {
213-
sArgs.removeFirst();
175+
if (sTemplate == QString::fromUtf8("Tabelle").toLower()) {
214176
return this->parseTable(sArgs);
215177
}
216-
if (sArgs[0].toLower() == QString::fromUtf8("Getestet").toLower()) {
217-
sArgs.removeFirst();
178+
if (sTemplate == QString::fromUtf8("Getestet").toLower()) {
218179
return this->parseTested(sArgs);
219180
}
220-
if (sArgs[0].trimmed().toLower() == QString::fromUtf8("UT").toLower()) {
221-
sArgs.removeFirst();
181+
if (sTemplate == QString::fromUtf8("UT").toLower()) {
222182
return this->parseTestedUT(sArgs);
223183
}
224-
if (sArgs[0].trimmed().toLower() ==
225-
QString::fromUtf8("Baustelle").toLower()) {
226-
sArgs.removeFirst();
184+
if (sTemplate == QString::fromUtf8("Baustelle").toLower()) {
227185
return ProvisionalTplParser::parseUnderConst(sArgs);
228186
}
229-
if (sArgs[0].toLower() == QString::fromUtf8("Warnung").toLower()) {
230-
sArgs.removeFirst();
187+
if (sTemplate == QString::fromUtf8("Warnung").toLower()) {
231188
return ProvisionalTplParser::parseWarning(sArgs);
232189
}
233-
if (sArgs[0].toLower() == QString::fromUtf8("Überarbeitung").toLower()) {
234-
sArgs.removeFirst();
190+
if (sTemplate == QString::fromUtf8("Überarbeitung").toLower()) {
235191
return ProvisionalTplParser::parseWorkInProgr(sArgs);
236192
}
237193
}
@@ -241,13 +197,20 @@ auto ProvisionalTplParser::parseTpl(const QStringList &sListArgs,
241197
// ----------------------------------------------------------------------------
242198
// ----------------------------------------------------------------------------
243199

244-
auto ProvisionalTplParser::parseAdvanced() -> QString {
200+
auto ProvisionalTplParser::parseAdvanced(const QStringList &sListArgs)
201+
-> QString {
202+
QString sRemark("");
203+
if (!sListArgs.isEmpty()) {
204+
sRemark = sListArgs.join("\n\n");
205+
}
206+
245207
return ProvisionalTplParser::insertBox(
246208
"box advanced",
247209
QString::fromUtf8("Artikel für fortgeschrittene Anwender"),
248210
QString::fromUtf8(
249211
"Dieser Artikel erfordert mehr Erfahrung im Umgang mit Linux und ist "
250-
"daher nur für fortgeschrittene Benutzer gedacht."));
212+
"daher nur für fortgeschrittene Benutzer gedacht."),
213+
sRemark);
251214
}
252215

253216
// ----------------------------------------------------------------------------

‎application/parser/provisionaltplparser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ProvisionalTplParser {
4444
const QString &sCurrentFile) -> QString;
4545

4646
private:
47-
static auto parseAdvanced() -> QString;
47+
static auto parseAdvanced(const QStringList &sListArgs) -> QString;
4848
static auto parseArchived(const QStringList &sListArgs) -> QString;
4949
static auto parseBash(const QStringList &sListArgs) -> QString;
5050
static auto parseBuilddeps(const QStringList &sListArgs) -> QString;

0 commit comments

Comments
 (0)