Merge tag 'upstream/3.0.0'

Upstream version 3.0.0

# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 16 insertions, 6 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
index 5e186dd..d3e05f1 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
@@ -434,40 +434,50 @@ bool TokenList::remove(Token::Type type)
     return true;
 }
 
-void TokenList::trimLeft()
+TokenList& TokenList::trimLeft()
 {
     while (size() > 0 && first()->isWhitespace())
         removeFirst();
+
+    return *this;
 }
 
-void TokenList::trimRight()
+TokenList& TokenList::trimRight()
 {
     while (size() > 0 && last()->isWhitespace())
         removeLast();
+
+    return *this;
 }
 
-void TokenList::trim()
+TokenList& TokenList::trim()
 {
     trimLeft();
     trimRight();
+    return *this;
 }
 
-void TokenList::trimLeft(Token::Type type, const QString& alsoTrim)
+TokenList& TokenList::trimLeft(Token::Type type, const QString& alsoTrim)
 {
     while (size() > 0 && (first()->isWhitespace() || (first()->type == type && first()->value == alsoTrim)))
         removeFirst();
+
+    return *this;
 }
 
-void TokenList::trimRight(Token::Type type, const QString& alsoTrim)
+TokenList& TokenList::trimRight(Token::Type type, const QString& alsoTrim)
 {
     while (size() > 0 && (last()->isWhitespace() || (last()->type == type && last()->value == alsoTrim)))
         removeLast();
+
+    return *this;
 }
 
-void TokenList::trim(Token::Type type, const QString& alsoTrim)
+TokenList& TokenList::trim(Token::Type type, const QString& alsoTrim)
 {
     trimLeft(type, alsoTrim);
     trimRight(type, alsoTrim);
+    return *this;
 }
 
 TokenList TokenList::filter(Token::Type type) const