svn commit: r530656 - head/graphics/dspdfviewer/files

[Tobias C. Berner]

Author: tcberner
Date: Sat Apr  4 13:10:57 2020
New Revision: 530656
URL: https://svnweb.freebsd.org/changeset/ports/530656

Log:
  graphics/dspdfviewer: Prepare for Qt5-5.14
  
  PR:		244964

Added:
  head/graphics/dspdfviewer/files/patch-dspdfviewer.h   (contents, props changed)
Modified:
  head/graphics/dspdfviewer/files/patch-dspdfviewer.cpp

Modified: head/graphics/dspdfviewer/files/patch-dspdfviewer.cpp
==============================================================================
--- head/graphics/dspdfviewer/files/patch-dspdfviewer.cpp	Sat Apr  4 13:10:25 2020	(r530655)
+++ head/graphics/dspdfviewer/files/patch-dspdfviewer.cpp	Sat Apr  4 13:10:57 2020	(r530656)
@@ -6,6 +6,19 @@ Fix build with Clang 8:
 
 --- dspdfviewer.cpp.orig	2016-09-13 13:18:47 UTC
 +++ dspdfviewer.cpp
+@@ -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)

Added: head/graphics/dspdfviewer/files/patch-dspdfviewer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/dspdfviewer/files/patch-dspdfviewer.h	Sat Apr  4 13:10:57 2020	(r530656)
@@ -0,0 +1,30 @@
+--- dspdfviewer.h.orig	2016-09-13 13:18:47 UTC
++++ dspdfviewer.h
+@@ -22,6 +22,7 @@
+ #define dspdfviewer_H
+ 
+ #include <QObject>
++#include <QElapsedTimer>
+ #include <QTimer>
+ #include <QFileSystemWatcher>
+ #include "poppler-qt.h"
+@@ -42,8 +43,8 @@ class DSPDFViewer: public QObject (private)
+ 
+ private:
+   QTimer	clockDisplayTimer;
+-  QTime 	slideStart;
+-  QTime		presentationStart;
++  QElapsedTimer 	slideStart;
++  QElapsedTimer		presentationStart;
+   bool		presentationClockRunning;
+ 
+ private:
+@@ -89,7 +90,7 @@ private slots: (public)
+     QTime slideClock() const;
+     QTime presentationClock() const;
+ 
+-    QTime timeSince( const QTime& startPoint) const;
++    QTime timeSince( const QElapsedTimer& startPoint) const;
+ 
+     bool isAudienceScreenBlank() const;
+