indentation

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

diff --git a/src/xml/kernel/qxmlstream.g b/src/xml/kernel/qxmlstream.g
index 448c0be..6e22a29 100644 (file)
--- a/src/xml/kernel/qxmlstream.g
+++ b/src/xml/kernel/qxmlstream.g
@@ -206,18 +206,18 @@ public:
 
     inline QStringRef addToStringStorage(const QStringRef &s) {
         int pos = tagStackStringStorageSize;
-       int sz = s.size();
-       if (pos != tagStackStringStorage.size())
-           tagStackStringStorage.resize(pos);
+        int sz = s.size();
+        if (pos != tagStackStringStorage.size())
+            tagStackStringStorage.resize(pos);
         tagStackStringStorage.insert(pos, s.unicode(), sz);
         tagStackStringStorageSize += sz;
         return QStringRef(&tagStackStringStorage, pos, sz);
     }
     inline QStringRef addToStringStorage(const QString &s) {
         int pos = tagStackStringStorageSize;
-       int sz = s.size();
-       if (pos != tagStackStringStorage.size())
-           tagStackStringStorage.resize(pos);
+        int sz = s.size();
+        if (pos != tagStackStringStorage.size())
+            tagStackStringStorage.resize(pos);
         tagStackStringStorage.insert(pos, s.unicode(), sz);
         tagStackStringStorageSize += sz;
         return QStringRef(&tagStackStringStorage, pos, sz);
@@ -524,7 +524,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::StartElement:
         name.clear();
         prefix.clear();
-       qualifiedName.clear();
+        qualifiedName.clear();
         namespaceUri.clear();
         if (publicNamespaceDeclarations.size())
             publicNamespaceDeclarations.clear();
@@ -535,7 +535,7 @@ bool QXmlStreamReaderPrivate::parse()
             Tag &tag = tagStack_pop();
             namespaceUri = tag.namespaceDeclaration.namespaceUri;
             name = tag.name;
-           qualifiedName = tag.qualifiedName;
+            qualifiedName = tag.qualifiedName;
             isEmptyElement = false;
             return true;
         }
@@ -544,7 +544,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::EndElement:
         name.clear();
         prefix.clear();
-       qualifiedName.clear();
+        qualifiedName.clear();
         namespaceUri.clear();
         clearTextBuffer();
         break;
@@ -558,7 +558,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::Comment:
     case QXmlStreamReader::Characters:
         isCDATA = false;
-       isWhitespace = true;
+        isWhitespace = true;
         text.clear();
         clearTextBuffer();
         break;
@@ -570,21 +570,21 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::ProcessingInstruction:
         processingInstructionTarget.clear();
         processingInstructionData.clear();
-       clearTextBuffer();
+        clearTextBuffer();
         break;
     case QXmlStreamReader::NoToken:
     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:
@@ -1224,7 +1224,7 @@ cdata ::= langle_bang CDATA_START;
         case $rule_number: {
             setType(QXmlStreamReader::Characters);
             isCDATA = true;
-           isWhitespace = false;
+            isWhitespace = false;
             int pos = sym(2).pos;
             if (scanUntil("]]>", -1)) {
                 text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
@@ -1293,7 +1293,7 @@ scan_content_char ::= SPACE;
                 resume($rule_number);
                 return false;
             }
-       break;
+        break;
 ./
 
 content_char_list ::= content_char_list char_ref;
@@ -1309,11 +1309,11 @@ content_char_list ::= scan_content_char;
 character_content ::= content_char_list %prec SHIFT_THERE;
 /.
         case $rule_number:
-           if (!textBuffer.isEmpty()) {
+            if (!textBuffer.isEmpty()) {
                 setType(QXmlStreamReader::Characters);
                 text = &textBuffer;
-           }
-       break;
+            }
+        break;
 ./
 
 literal ::= QUOTE QUOTE;
@@ -1360,7 +1360,7 @@ literal_content_start ::= LETTER | DIGIT | RANGLE | HASH | LBRACK | RBRACK | LPA
 literal_content_start ::= SPACE;
 /.
         case $rule_number:
-           if (normalizeLiterals)
+            if (normalizeLiterals)
                 textBuffer.data()[textBuffer.size()-1] = QLatin1Char(' ');
         break;
 ./
@@ -1404,7 +1404,7 @@ entity_value ::= QUOTE entity_value_content_with_dblquote QUOTE;
 entity_value ::= DBLQUOTE entity_value_content_with_quote DBLQUOTE;
 /.
         case $rule_number:
-           sym(1) = sym(2);
+            sym(1) = sym(2);
         break;
 ./
 
@@ -1608,7 +1608,7 @@ unresolved_entity ::= UNRESOLVED_ENTITY;
             }
             setType(QXmlStreamReader::EntityReference);
             name = &unresolvedEntity;
-       break;
+        break;
 ./
 
 entity_ref ::= AMPERSAND name SEMICOLON;
@@ -1645,10 +1645,10 @@ entity_ref ::= AMPERSAND name SEMICOLON;
                 }
             }
 
-           injectToken(UNRESOLVED_ENTITY);
-           unresolvedEntity = symString(2).toString();
-           textBuffer.chop(2 + sym(2).len);
-           clearSym();
+            injectToken(UNRESOLVED_ENTITY);
+            unresolvedEntity = symString(2).toString();
+            textBuffer.chop(2 + sym(2).len);
+            clearSym();
 
         } break;
 ./

diff --git a/src/xml/kernel/qxmlstream_p.h b/src/xml/kernel/qxmlstream_p.h
index 3ad5aba..0a69e0c 100644 (file)
--- a/src/xml/kernel/qxmlstream_p.h
+++ b/src/xml/kernel/qxmlstream_p.h
@@ -1007,7 +1007,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::StartElement:
         name.clear();
         prefix.clear();
-       qualifiedName.clear();
+        qualifiedName.clear();
         namespaceUri.clear();
         if (publicNamespaceDeclarations.size())
             publicNamespaceDeclarations.clear();
@@ -1018,7 +1018,7 @@ bool QXmlStreamReaderPrivate::parse()
             Tag &tag = tagStack_pop();
             namespaceUri = tag.namespaceDeclaration.namespaceUri;
             name = tag.name;
-           qualifiedName = tag.qualifiedName;
+            qualifiedName = tag.qualifiedName;
             isEmptyElement = false;
             return true;
         }
@@ -1027,7 +1027,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::EndElement:
         name.clear();
         prefix.clear();
-       qualifiedName.clear();
+        qualifiedName.clear();
         namespaceUri.clear();
         clearTextBuffer();
         break;
@@ -1041,7 +1041,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::Comment:
     case QXmlStreamReader::Characters:
         isCDATA = false;
-       isWhitespace = true;
+        isWhitespace = true;
         text.clear();
         clearTextBuffer();
         break;
@@ -1053,7 +1053,7 @@ bool QXmlStreamReaderPrivate::parse()
     case QXmlStreamReader::ProcessingInstruction:
         processingInstructionTarget.clear();
         processingInstructionData.clear();
-       clearTextBuffer();
+        clearTextBuffer();
         break;
     case QXmlStreamReader::NoToken:
     case QXmlStreamReader::Invalid:
@@ -1538,7 +1538,7 @@ bool QXmlStreamReaderPrivate::parse()
         case 101: {
             setType(QXmlStreamReader::Characters);
             isCDATA = true;
-           isWhitespace = false;
+            isWhitespace = false;
             int pos = sym(2).pos;
             if (scanUntil("]]>", -1)) {
                 text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
@@ -1585,14 +1585,14 @@ bool QXmlStreamReaderPrivate::parse()
                 resume(130);
                 return false;
             }
-       break;
+        break;
 
         case 139:
-           if (!textBuffer.isEmpty()) {
+            if (!textBuffer.isEmpty()) {
                 setType(QXmlStreamReader::Characters);
                 text = &textBuffer;
-           }
-       break;
+            }
+        break;
 
         case 140:
         case 141:
@@ -1612,7 +1612,7 @@ bool QXmlStreamReaderPrivate::parse()
         break;
 
         case 173:
-           if (normalizeLiterals)
+            if (normalizeLiterals)
                 textBuffer.data()[textBuffer.size()-1] = QLatin1Char(' ');
         break;
 
@@ -1639,7 +1639,7 @@ bool QXmlStreamReaderPrivate::parse()
 
         case 178:
         case 179:
-           sym(1) = sym(2);
+            sym(1) = sym(2);
         break;
 
         case 180:
@@ -1777,7 +1777,7 @@ bool QXmlStreamReaderPrivate::parse()
             }
             setType(QXmlStreamReader::EntityReference);
             name = &unresolvedEntity;
-       break;
+        break;
 
         case 240: {
             sym(1).len += sym(2).len + 1;
@@ -1811,10 +1811,10 @@ bool QXmlStreamReaderPrivate::parse()
                 }
             }
 
-           injectToken(UNRESOLVED_ENTITY);
-           unresolvedEntity = symString(2).toString();
-           textBuffer.chop(2 + sym(2).len);
-           clearSym();
+            injectToken(UNRESOLVED_ENTITY);
+            unresolvedEntity = symString(2).toString();
+            textBuffer.chop(2 + sym(2).len);
+            clearSym();
 
         } break;