Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

private structures cleanup

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-11 20:10:37 +00:00
parent db88a21f69
commit b704f83a58
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xml/dom/qdom.cpp
View file

@ -201,8 +201,8 @@ public:
QString value;
QString prefix; // set this only for ElementNode and AttributeNode
QString namespaceURI; // set this only for ElementNode and AttributeNode
bool createdWithDom1Interface : 1;
bool hasParent : 1;
bool createdWithDom1Interface;
bool hasParent;
int lineNumber;
int columnNumber;
@ -532,7 +532,7 @@ public:
QDomAttrPrivate* createAttributeNS(const QString& nsURI, const QString& qName);
QDomEntityReferencePrivate* createEntityReference(const QString& name);
QDomNodePrivate* importNode(const QDomNodePrivate* importedNode, bool deep);
QDomNodePrivate* importNode(QDomNodePrivate* importedNode, bool deep);
// Reimplemented from QDomNodePrivate
QDomNodePrivate* cloneNode(bool deep = true);
@ -6381,7 +6381,7 @@ QDomEntityReferencePrivate* QDomDocumentPrivate::createEntityReference(const QSt
return e;
}
QDomNodePrivate* QDomDocumentPrivate::importNode(const QDomNodePrivate *importedNode, bool deep)
QDomNodePrivate* QDomDocumentPrivate::importNode(QDomNodePrivate *importedNode, bool deep)
{
QDomNodePrivate *node = 0;
switch (importedNode->nodeType()) {

48
src/xml/kernel/qxmlstream_p.h
View file

@ -761,11 +761,11 @@ public:
static inline Entity createLiteral(const QString &entity)
{ Entity result(entity); result.literal = result.hasBeenParsed = true; return result; }
QString value;
uint external : 1;
uint unparsed : 1;
uint literal : 1;
uint hasBeenParsed : 1;
uint isCurrentlyReferenced : 1;
bool external;
bool unparsed;
bool literal;
bool hasBeenParsed;
bool isCurrentlyReferenced;
};
QHash<QString, Entity> entityHash;
QHash<QString, Entity> parameterEntityHash;
@ -864,19 +864,19 @@ public:
QStringRef processingInstructionTarget, processingInstructionData;
QStringRef dtdName, dtdPublicId, dtdSystemId;
QStringRef documentVersion, documentEncoding;
uint isEmptyElement : 1;
uint isWhitespace : 1;
uint isCDATA : 1;
uint standalone : 1;
uint hasCheckedStartDocument : 1;
uint normalizeLiterals : 1;
uint hasSeenTag : 1;
uint inParseEntity : 1;
uint referenceToUnparsedEntityDetected : 1;
uint referenceToParameterEntityDetected : 1;
uint hasExternalDtdSubset : 1;
uint lockEncoding : 1;
uint namespaceProcessing : 1;
bool isEmptyElement;
bool isWhitespace;
bool isCDATA;
bool standalone;
bool hasCheckedStartDocument;
bool normalizeLiterals;
bool hasSeenTag;
bool inParseEntity;
bool referenceToUnparsedEntityDetected;
bool referenceToParameterEntityDetected;
bool hasExternalDtdSubset;
bool lockEncoding;
bool namespaceProcessing;
int resumeReduction;
void resume(int rule);
@ -1071,15 +1071,15 @@ bool QXmlStreamReaderPrivate::parse()
case QXmlStreamReader::Invalid:
break;
case QXmlStreamReader::StartDocument:
lockEncoding = true;
lockEncoding = true;
documentVersion.clear();
documentEncoding.clear();
#ifndef QT_NO_TEXTCODEC
if(decoder->hasFailure()) {
raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content."));
readBuffer.clear();
return false;
}
if(decoder->hasFailure()) {
raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content."));
readBuffer.clear();
return false;
}
#endif
// fall through
default: