From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 lib/astyle/ASBeautifier.cpp |  4 ++--
 lib/astyle/ASFormatter.cpp  | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/astyle')

diff --git a/lib/astyle/ASBeautifier.cpp b/lib/astyle/ASBeautifier.cpp
index 432d58a9..7ea8ec5f 100644
--- a/lib/astyle/ASBeautifier.cpp
+++ b/lib/astyle/ASBeautifier.cpp
@@ -1067,7 +1067,7 @@ string ASBeautifier::beautify(const string &originalLine)
 			}
 		}
 
-		// handle parenthesies
+		// handle tqparenthesies
 		if (ch == '(' || ch == '[' || ch == ')' || ch == ']')
 		{
 			if (ch == '(' || ch == '[')
@@ -1555,7 +1555,7 @@ string ASBeautifier::beautify(const string &originalLine)
 		}
 
 
-		// check for preBlockStatements ONLY if not within parenthesies
+		// check for preBlockStatements ONLY if not within tqparenthesies
 		// (otherwise 'struct XXX' statements would be wrongly interpreted...)
 		if (isWhiteSpace(prevCh) && !isInTemplate && parenDepth == 0)
 		{
diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp
index eb418760..62f7efc4 100644
--- a/lib/astyle/ASFormatter.cpp
+++ b/lib/astyle/ASFormatter.cpp
@@ -573,7 +573,7 @@ string ASFormatter::nextLine()
 			}
 		}
 
-		// handle parenthesies
+		// handle tqparenthesies
 		if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<'))
 		{
 			parenStack->back()++;
@@ -593,7 +593,7 @@ string ASFormatter::nextLine()
 				}
 			}
 
-			// check if this parenthesis closes a header, e.g. if (...), while (...)
+			// check if this tqparenthesis closes a header, e.g. if (...), while (...)
 			if (isInHeader && parenStack->back() == 0)
 			{
 				isInHeader = false;
@@ -1033,10 +1033,10 @@ void ASFormatter::setOperatorPaddingMode(bool state)
 }
 
 /**
-* set parenthesis outside padding mode.
+* set tqparenthesis outside padding mode.
 * options:
-*    true     statement parenthesiss will be padded with spaces around them.
-*    false    statement parenthesiss will not be padded.
+*    true     statement tqparenthesiss will be padded with spaces around them.
+*    false    statement tqparenthesiss will not be padded.
 *
 * @param state         the padding mode.
 */
@@ -1046,10 +1046,10 @@ void ASFormatter::setParensOutsidePaddingMode(bool state)
 }
 
 /**
-* set parenthesis inside padding mode.
+* set tqparenthesis inside padding mode.
 * options:
-*    true     statement parenthesis will be padded with spaces around them.
-*    false    statement parenthesis will not be padded.
+*    true     statement tqparenthesis will be padded with spaces around them.
+*    false    statement tqparenthesis will not be padded.
 *
 * @param state         the padding mode.
 */
@@ -1059,10 +1059,10 @@ void ASFormatter::setParensInsidePaddingMode(bool state)
 }
 
 /**
-* set parenthesis unpadding mode.
+* set tqparenthesis unpadding mode.
 * options:
-*    true     statement parenthesis will be unpadded with spaces removed around them.
-*    false    statement parenthesis will not be unpadded.
+*    true     statement tqparenthesis will be unpadded with spaces removed around them.
+*    false    statement tqparenthesis will not be unpadded.
 *
 * @param state         the padding mode.
 */
-- 
cgit v1.2.1