From 1e55fa7d4a9688274a097021d3f44e729f7d0a59 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 12 Feb 2013 09:15:25 +0100 Subject: [PATCH] Fix extending example. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The antialiasing was broken due to wrong flag being used and that the bounds were outside the texture and chapter 5 and 6 did not compile. Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c Reviewed-by: Samuel Rødal --- .../extending/chapter1-basics/piechart.cpp | 4 ++-- .../extending/chapter2-methods/piechart.cpp | 4 ++-- .../extending/chapter3-bindings/piechart.cpp | 4 ++-- .../chapter4-customPropertyTypes/pieslice.cpp | 4 ++-- .../extending/chapter5-listproperties/piechart.cpp | 2 +- .../extending/chapter5-listproperties/pieslice.cpp | 4 ++-- .../extending/chapter6-plugins/piechart.cpp | 3 +-- .../extending/chapter6-plugins/pieslice.cpp | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp index 79c06d0..fa00578 100644 --- a/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp @@ -72,8 +72,8 @@ void PieChart::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), 90 * 16, 290 * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16); } //![1] diff --git a/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp index b0b116f..ddcb1b3 100644 --- a/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp @@ -69,8 +69,8 @@ void PieChart::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), 90 * 16, 290 * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16); } //![0] diff --git a/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp index f12b4f7..a630350 100644 --- a/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp @@ -75,8 +75,8 @@ void PieChart::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), 90 * 16, 290 * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16); } void PieChart::clearChart() diff --git a/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp index c929deb..2afe820 100644 --- a/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp @@ -60,7 +60,7 @@ void PieSlice::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), 90 * 16, 290 * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16); } diff --git a/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp index 2cfbe4d..9fb61d9 100644 --- a/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp @@ -58,7 +58,7 @@ void PieChart::setName(const QString &name) //![0] QQmlListProperty PieChart::slices() { - return QQmlListProperty(this, 0, &PieChart::append_slice); + return QQmlListProperty(this, 0, &PieChart::append_slice, 0, 0, 0); } void PieChart::append_slice(QQmlListProperty *list, PieSlice *slice) diff --git a/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp index 3269fd6..52b409a 100644 --- a/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp @@ -80,7 +80,7 @@ void PieSlice::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), m_fromAngle * 16, m_angleSpan * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), m_fromAngle * 16, m_angleSpan * 16); } diff --git a/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp index dce05ae..295bb89 100644 --- a/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp @@ -57,7 +57,7 @@ void PieChart::setName(const QString &name) QQmlListProperty PieChart::slices() { - return QQmlListProperty(this, 0, &PieChart::append_slice); + return QQmlListProperty(this, 0, &PieChart::append_slice, 0, 0, 0); } void PieChart::append_slice(QQmlListProperty *list, PieSlice *slice) @@ -68,4 +68,3 @@ void PieChart::append_slice(QQmlListProperty *list, PieSlice *slice) chart->m_slices.append(slice); } } - diff --git a/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp index 3269fd6..52b409a 100644 --- a/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp @@ -80,7 +80,7 @@ void PieSlice::paint(QPainter *painter) { QPen pen(m_color, 2); painter->setPen(pen); - painter->setRenderHints(QPainter::HighQualityAntialiasing, true); - painter->drawPie(boundingRect(), m_fromAngle * 16, m_angleSpan * 16); + painter->setRenderHints(QPainter::Antialiasing, true); + painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), m_fromAngle * 16, m_angleSpan * 16); } -- 1.7.2.5