Changeset View
Changeset View
Standalone View
Standalone View
src/lib/definition.cpp
Show First 20 Lines • Show All 190 Lines • ▼ Show 20 Line(s) | |||||
191 | { | 191 | { | ||
192 | d->load(); | 192 | d->load(); | ||
193 | return d->keywordList(name).keywords(); | 193 | return d->keywordList(name).keywords(); | ||
194 | } | 194 | } | ||
195 | 195 | | |||
196 | QVector<Format> Definition::formats() const | 196 | QVector<Format> Definition::formats() const | ||
197 | { | 197 | { | ||
198 | d->load(); | 198 | d->load(); | ||
199 | return QVector<Format>::fromList(d->formats.values()); | 199 | | ||
200 | // sort formats so that the order matches the order of the itemDatas in the xml files. | ||||
201 | auto formatList = QVector<Format>::fromList(d->formats.values()); | ||||
202 | std::sort(formatList.begin(), formatList.end(), [](const KSyntaxHighlighting::Format & lhs, const KSyntaxHighlighting::Format & rhs){ | ||||
203 | return lhs.id() < rhs.id(); | ||||
204 | }); | ||||
205 | | ||||
206 | return formatList; | ||||
200 | } | 207 | } | ||
201 | 208 | | |||
202 | QVector<Definition> Definition::includedDefinitions() const | 209 | QVector<Definition> Definition::includedDefinitions() const | ||
203 | { | 210 | { | ||
204 | d->load(); | 211 | d->load(); | ||
205 | 212 | | |||
206 | QVector<Definition> definitions; | 213 | QVector<Definition> definitions; | ||
207 | 214 | | |||
▲ Show 20 Lines • Show All 403 Lines • Show Last 20 Lines |