From a6e1c3cb54dcf419aa3b86ecd24865198906e313 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@theqtcompany.com>
Date: Wed, 20 May 2015 08:38:52 +0200
Subject: [PATCH] Editor: Allow negative folding indent.

Fixing folding issues in the c++ editor if too many closing folding
regions were found.

Change-Id: I5c3476a6922af07be9b49d396b684a5f3b5a5e33
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/texteditor/textdocumentlayout.cpp |  2 +-
 src/plugins/texteditor/textdocumentlayout.h   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp
index 4187ef31e0b..861260ac3bb 100644
--- a/src/plugins/texteditor/textdocumentlayout.cpp
+++ b/src/plugins/texteditor/textdocumentlayout.cpp
@@ -498,7 +498,7 @@ void TextDocumentLayout::setFoldingIndent(const QTextBlock &block, int indent)
         if (TextBlockUserData *userData = testUserData(block))
             userData->setFoldingIndent(0);
     } else {
-        userData(block)->setFoldingIndent(qMax(0,indent));
+        userData(block)->setFoldingIndent(indent);
     }
 }
 
diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h
index d43a3535d92..72f5632f8e3 100644
--- a/src/plugins/texteditor/textdocumentlayout.h
+++ b/src/plugins/texteditor/textdocumentlayout.h
@@ -66,13 +66,13 @@ class TEXTEDITOR_EXPORT TextBlockUserData : public QTextBlockUserData
 public:
 
     inline TextBlockUserData()
-        : m_folded(false),
-          m_ifdefedOut(false),
-          m_foldingIndent(0),
-          m_lexerState(0),
-          m_foldingStartIncluded(false),
-          m_foldingEndIncluded(false),
-          m_codeFormatterData(0)
+        : m_foldingIndent(0)
+        , m_folded(false)
+        , m_ifdefedOut(false)
+        , m_lexerState(0)
+        , m_foldingStartIncluded(false)
+        , m_foldingEndIncluded(false)
+        , m_codeFormatterData(0)
     {}
     ~TextBlockUserData();
 
@@ -138,9 +138,9 @@ public:
 
 private:
     TextMarks m_marks;
+    int m_foldingIndent : 16;
     uint m_folded : 1;
     uint m_ifdefedOut : 1;
-    uint m_foldingIndent : 16;
     uint m_lexerState : 8;
     uint m_foldingStartIncluded : 1;
     uint m_foldingEndIncluded : 1;