1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Fix build with Clang 8:
../dspdfviewer.cpp:311:48: error: empty expression statement has no effect; remove unnecessary ';' to silence this warning [-Werror,-Wextra-semi-stmt]
QSize newSize = window.getPreviewImageSize();;
^
--- dspdfviewer.cpp.orig 2016-09-13 13:18:47 UTC
+++ dspdfviewer.cpp
@@ -47,7 +47,7 @@ DSPDFViewer::DSPDFViewer(const RuntimeConfiguration& r
renderFactory(r),
m_pagenumber(0),
audienceWindow(1, r.useFullPage() ? PagePart::FullPage : PagePart::LeftHalf , false, r, WindowRole::AudienceWindow),
- secondaryWindow(0, (r.useFullPage() | r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen())
+ secondaryWindow(0, (r.useFullPage() || r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen())
{
DEBUGOUT << tr("Starting constructor") ;
@@ -292,10 +292,10 @@ void DSPDFViewer::sendAllClockSignals() const
emit presentationClockUpdate(presentationClock());
}
-QTime DSPDFViewer::timeSince(const QTime& startPoint) const
+QTime DSPDFViewer::timeSince(const QElapsedTimer& startPoint) const
{
QTime result(0,0);
- result = result.addMSecs(startPoint.elapsed());
+ result = result.addMSecs(static_cast<int>(startPoint.elapsed()));
return result;
}
@@ -308,7 +308,7 @@ RenderingIdentifier DSPDFViewer::toRenderIdent(unsigne
RenderingIdentifier DSPDFViewer::toThumbnailRenderIdent(unsigned int pageNumber, PDFViewerWindow& window)
{
- QSize newSize = window.getPreviewImageSize();;
+ QSize newSize = window.getPreviewImageSize();
static QSize thumbnailSize;
if ( thumbnailSize != newSize ) {
DEBUGOUT << "Thumbnail size changed from" << thumbnailSize << "to" << newSize;
|
