aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/collidingmice/mouse.cpp2
-rw-r--r--src/lib/corelib/parser/qmlerror.cpp8
-rw-r--r--src/lib/corelib/parser/qmljslexer.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/collidingmice/mouse.cpp b/examples/collidingmice/mouse.cpp
index a2e3213f6..00db651a7 100644
--- a/examples/collidingmice/mouse.cpp
+++ b/examples/collidingmice/mouse.cpp
@@ -148,7 +148,7 @@ void Mouse::advance(int step)
foreach (QGraphicsItem *item, dangerMice) {
if (item == this)
continue;
-
+
QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0));
qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length());
if (lineToMouse.dy() < 0)
diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index b94fd1556..39fa7baac 100644
--- a/src/lib/corelib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
@@ -114,7 +114,7 @@ QmlError &QmlError::operator=(const QmlError &other)
}
/*!
- \internal
+ \internal
*/
QmlError::~QmlError()
{
@@ -211,7 +211,7 @@ QString QmlError::toString() const
rv = QLatin1String("<Unknown File>");
} else if (line() != -1) {
rv = url().toString() + QLatin1Char(':') + QString::number(line());
- if(column() != -1)
+ if (column() != -1)
rv += QLatin1Char(':') + QString::number(column());
} else {
rv = url().toString();
@@ -257,9 +257,9 @@ QDebug operator<<(QDebug debug, const QmlError &error)
const QString &line = lines.at(error.line() - 1);
debug << "\n " << qPrintable(line);
- if(error.column() > 0) {
+ if (error.column() > 0) {
int column = qMax(0, error.column() - 1);
- column = qMin(column, line.length());
+ column = qMin(column, line.length());
QByteArray ind;
ind.reserve(column);
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index 515de2654..f5047f653 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -556,7 +556,7 @@ again:
_validTokenText = true;
_tokenText.resize(0);
startCode--;
- while (startCode != _codePtr - 1)
+ while (startCode != _codePtr - 1)
_tokenText += *startCode++;
while (! _char.isNull()) {