r23480 by jghali - Fix some deprecation warnings related to QTime::elapsed() when compiling with Qt 5.14

[scribus-commit]

Author: jghali
Date: Wed Mar  4 11:05:05 2020
New Revision: 23480

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23480
Log:
Fix some deprecation warnings related to QTime::elapsed() when compiling with Qt 5.14

Modified:
    trunk/Scribus/scribus/canvasmode_edittable.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribusview.h

Modified: trunk/Scribus/scribus/canvasmode_edittable.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23480&path=/trunk/Scribus/scribus/canvasmode_edittable.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.h	(original)
+++ trunk/Scribus/scribus/canvasmode_edittable.h	Wed Mar  4 11:05:05 2020
@@ -10,8 +10,8 @@
 #define CANVASMODE_EDITTABLE_H
 
 #include <QCursor>
+#include <QElapsedTimer>
 #include <QObject>
-#include <QTime>
 
 #include "canvasmode.h"
 #include "cellarea.h"
@@ -81,7 +81,7 @@
 	QTimer* m_canvasUpdateTimer;
 
 	/// Time since last text cursor blink.
-	QTime m_blinkTime;
+	QElapsedTimer m_blinkTime;
 	/// <code>true</code> if the text cursor should make a long blink.
 	bool m_longBlink;
 	/// <code>true</code> if the text cursor is visible.

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23480&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Wed Mar  4 11:05:05 2020
@@ -27,6 +27,7 @@
 #include "sclimits.h"
 
 #include <QColor>
+#include <QCursor>
 #include <QDebug>
 #include <QDrag>
 #include <QDragEnterEvent>

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23480&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h	(original)
+++ trunk/Scribus/scribus/scribusview.h	Wed Mar  4 11:05:05 2020
@@ -26,40 +26,35 @@
 
 #include <vector>
 // include files for QT
-#include <QScrollArea>
-#include <QLineEdit>
-#include <QScrollBar>
-#include <QMap>
-#include <QMenu>
-#include <QLabel>
-#include <QComboBox>
-#include <QProgressDialog>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QCursor>
 #include <QDragLeaveEvent>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
+#include <QElapsedTimer>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMap>
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <QPoint>
+#include <QPushButton>
 #include <QRect>
 #include <QRectF>
 #include <QSize>
-#include <QTime>
 #include <QTimer>
+#include <QScrollArea>
+#include <QScrollBar>
 #include <QWheelEvent>
-#include <QRubberBand>
-#include <QList>
 
 class QEvent;
+class QMenu;
 class QMimeData;
 
 // application specific includes
 #include "observable.h"
 #include "scribusapi.h"
 #include "scribusdoc.h"
+#include "selectionrubberband.h"
 #include "ui/clockwidget.h"
 #include "undotransaction.h"
 
@@ -79,7 +74,6 @@
 class Selection;
 class UndoManager;
 class TransactionSettings;
-#include "selectionrubberband.h"
 
 /**
  * This class provides an incomplete base for your application view.
@@ -272,7 +266,7 @@
 	QMenu *pmen3;
 	QMenu *pmenResolution;
 	QPoint m_pressLocation;
-	QTime m_moveTimer;
+	QElapsedTimer m_moveTimer;
 	QTimer *m_dragTimer;
 	bool  m_dragTimerFired;
 	bool  m_ready;