private structures cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 95d6a60..d831f94 100644 (file)
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -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()) {

diff --git a/src/xml/kernel/qxmlstream_p.h b/src/xml/kernel/qxmlstream_p.h
index 41fb598..56613a0 100644 (file)
--- a/src/xml/kernel/qxmlstream_p.h
+++ b/src/xml/kernel/qxmlstream_p.h
@@ -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: