OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 } | 56 } |
57 | 57 |
58 bool SVGTests::isValid(Document& document) const | 58 bool SVGTests::isValid(Document& document) const |
59 { | 59 { |
60 // No need to check requiredFeatures since hasFeature always returns true. | 60 // No need to check requiredFeatures since hasFeature always returns true. |
61 | 61 |
62 if (m_systemLanguage->isSpecified()) { | 62 if (m_systemLanguage->isSpecified()) { |
63 bool matchFound = false; | 63 bool matchFound = false; |
64 | 64 |
65 const Vector<String>& systemLanguage = m_systemLanguage->value()->values
(); | 65 const Vector<String>& systemLanguage = m_systemLanguage->value()->values
(); |
66 Vector<String>::const_iterator it = systemLanguage.begin(); | 66 for (const auto& value : systemLanguage) { |
67 Vector<String>::const_iterator itEnd = systemLanguage.end(); | 67 if (value == defaultLanguage().string().substring(0, 2)) { |
68 for (; it != itEnd; ++it) { | |
69 if (*it == defaultLanguage().string().substring(0, 2)) { | |
70 matchFound = true; | 68 matchFound = true; |
71 break; | 69 break; |
72 } | 70 } |
73 } | 71 } |
74 | 72 |
75 if (!matchFound) | 73 if (!matchFound) |
76 return false; | 74 return false; |
77 } | 75 } |
78 | 76 |
79 if (!m_requiredExtensions->value()->values().isEmpty()) | 77 if (!m_requiredExtensions->value()->values().isEmpty()) |
(...skipping 30 matching lines...) Expand all Loading... |
110 } | 108 } |
111 | 109 |
112 void SVGTests::addSupportedAttributes(HashSet<QualifiedName>& supportedAttribute
s) | 110 void SVGTests::addSupportedAttributes(HashSet<QualifiedName>& supportedAttribute
s) |
113 { | 111 { |
114 supportedAttributes.add(SVGNames::requiredFeaturesAttr); | 112 supportedAttributes.add(SVGNames::requiredFeaturesAttr); |
115 supportedAttributes.add(SVGNames::requiredExtensionsAttr); | 113 supportedAttributes.add(SVGNames::requiredExtensionsAttr); |
116 supportedAttributes.add(SVGNames::systemLanguageAttr); | 114 supportedAttributes.add(SVGNames::systemLanguageAttr); |
117 } | 115 } |
118 | 116 |
119 } | 117 } |
OLD | NEW |