AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of the QRegExp dependency in qxmlutils.

Browse Source 
This makes the XML parser 100% independent of having regexp
support enabled.

Change-Id: I73004b0fb71e8086618995c71a985a86c292df3d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2016-02-04 23:07:26 +01:00
parent 0b8ff1cc99
commit b64a94516b
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/xml/qxmlutils.cpp
View File

@ -37,7 +37,6 @@
**
****************************************************************************/
#include <qregexp.h>
#include <qstring.h>
#include "qxmlutils_p.h"
@ -230,14 +229,20 @@ bool QXmlUtils::isBaseChar(const QChar c)
*/
bool QXmlUtils::isEncName(const QString &encName)
{
/* Right, we here have a dependency on QRegExp. Writing a manual parser to
* replace that regexp is probably a 70 lines so I prioritize this to when
* the dependency is considered alarming, or when the rest of the bugs
* are fixed. */
QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*"));
Q_ASSERT(encNameRegExp.isValid());
return encNameRegExp.exactMatch(encName);
// Valid encoding names are given by "[A-Za-z][A-Za-z0-9._\\-]*"
const ushort *c = encName.utf16();
int l = encName.length();
if (l < 1 || !((c[0] >= 'a' && c[0] <= 'z') || (c[0] >= 'A' && c[0] <= 'Z')))
return false;
for (int i = 1; i < l; ++i) {
if ((c[i] >= 'a' && c[i] <= 'z')
|| (c[i] >= 'A' && c[i] <= 'Z')
|| (c[i] >= '0' && c[i] <= '9')
|| c[i] == '.' || c[i] == '_' || c[i] == '-')
continue;
return false;
}
return true;
}
/*!