summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-11 20:13:31 (GMT)
committerMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-11 20:13:31 (GMT)
commitad6e3fe8503c050ae983e6220b1fe63d421ae878 (patch)
treef87bb9ce9bc09316483c99396b444db9e53313dc
parent44624bd52d1a39034575526a1fcb3964422e2f2a (diff)
Port away from obsolete QRect/QRegion members
-rw-r--r--generators/dvi/dviRenderer_draw.cpp4
-rw-r--r--ui/pageviewannotator.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/generators/dvi/dviRenderer_draw.cpp b/generators/dvi/dviRenderer_draw.cpp
index 857d277..f83b416 100644
--- a/generators/dvi/dviRenderer_draw.cpp
+++ b/generators/dvi/dviRenderer_draw.cpp
@@ -111,7 +111,7 @@ void dviRenderer::set_char(unsigned int cmd, unsigned int ch)
dhl.linkText = *HTML_href;
currentlyDrawnPage->hyperLinkList.push_back(dhl);
} else {
- QRect dshunion = currentlyDrawnPage->hyperLinkList[currentlyDrawnPage->hyperLinkList.size()-1].box.unite(QRect(x, y, pix.width(), pix.height())) ;
+ QRect dshunion = currentlyDrawnPage->hyperLinkList[currentlyDrawnPage->hyperLinkList.size()-1].box.united(QRect(x, y, pix.width(), pix.height())) ;
currentlyDrawnPage->hyperLinkList[currentlyDrawnPage->hyperLinkList.size()-1].box = dshunion;
}
}
@@ -135,7 +135,7 @@ void dviRenderer::set_char(unsigned int cmd, unsigned int ch)
dhl.linkText = QLatin1String("");
currentDVIPage->sourceHyperLinkList.push_back(dhl);
} else {
- QRect dshunion = currentDVIPage->sourceHyperLinkList[currentDVIPage->sourceHyperLinkList.size()-1].box.unite(QRect(x, y, pix.width(), pix.height())) ;
+ QRect dshunion = currentDVIPage->sourceHyperLinkList[currentDVIPage->sourceHyperLinkList.size()-1].box.united(QRect(x, y, pix.width(), pix.height())) ;
currentDVIPage->sourceHyperLinkList[currentDVIPage->sourceHyperLinkList.size()-1].box = dshunion;
}
}
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index 49bf3d5..dbb46cb 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -835,7 +835,7 @@ QRect PageViewAnnotator::performRouteMouseOrTabletEvent(const AnnotatorEngine::E
m_lastDrawnRect = paintRect;
m_lastDrawnRect.translate( itemRect.left(), itemRect.top() );
// 3.2. decompose paint region in rects and send paint events
- const QVector<QRect> rects = compoundRegion.unite( m_lastDrawnRect ).rects();
+ const QVector<QRect> rects = compoundRegion.united( m_lastDrawnRect ).rects();
const QPoint areaPos = m_pageView->contentAreaPosition();
for ( int i = 0; i < rects.count(); i++ )
m_pageView->viewport()->update( rects[i].translated( -areaPos ) );
@@ -947,7 +947,7 @@ void PageViewAnnotator::routePaint( QPainter * painter, const QRect & paintRect
// TODO: Clip annotation painting to cropped page.
// transform cliprect from absolute to item relative coords
- QRect annotRect = paintRect.intersect( m_lastDrawnRect );
+ QRect annotRect = paintRect.intersected( m_lastDrawnRect );
annotRect.translate( -itemRect.topLeft() );
// use current engine for painting (in virtual page coordinates)