From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: Whitespace cleanup: remove trailing whitespace Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen --- src/gui/opengl/qtriangulator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/opengl/qtriangulator.cpp') diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp index 83c7c93fdf..d3c80e264f 100644 --- a/src/gui/opengl/qtriangulator.cpp +++ b/src/gui/opengl/qtriangulator.cpp @@ -370,7 +370,7 @@ bool QIntersectionPoint::isOnLine(const QPodPoint &u, const QPodPoint &v) const if (((q.x < 0) == (q.y < 0)) != ((p.x < 0) == (p.y < 0))) return false; // 'p + offset' and 'q' pass through different quadrants. - + // Move all coordinates into the first quadrant. quint64 nx, ny; if (p.x < 0) @@ -991,7 +991,7 @@ void QTriangulator::ComplexToSimple::initEdges() if (first != m_edges.size()) m_edges.last().to = m_edges.at(first).from; for (int i = 0; i < m_edges.size(); ++i) { - m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp = + m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp = m_parent->m_vertices.at(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from); } } @@ -1646,7 +1646,7 @@ QTriangulator::ComplexToSimple::DebugDialog::DebugDialog(ComplexToSimple *par QDataBuffer &vertices = m_parent->m_parent->m_vertices; if (vertices.isEmpty()) return; - + int minX, maxX, minY, maxY; minX = maxX = vertices.at(0).x; minY = maxY = vertices.at(0).y; @@ -1671,7 +1671,7 @@ void QTriangulator::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *) QDataBuffer &vertices = m_parent->m_parent->m_vertices; if (vertices.isEmpty()) return; - + qreal halfPointSize = qMin(m_window.width(), m_window.height()) / 300.0; p.setWindow(m_window.toRect()); @@ -1725,7 +1725,7 @@ void QTriangulator::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *) } u += q; v += q; - p.drawLine(u.x, u.y, v.x, v.y); + p.drawLine(u.x, u.y, v.x, v.y); } } -- cgit v1.2.3