mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 00:30:33 -04:00
dspdfviewer.cpp:50:22: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] secondaryWindow(0, (r.useFullPage() | r.duplicate())? PagePart::FullPage
39 lines
1.8 KiB
C++
39 lines
1.8 KiB
C++
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;
|