[Fix] warning

alphaonex86 · Dec 3, 2021 · 47c5999 · 47c5999
1 parent 4d1653e
commit 47c5999
Show file tree

Hide file tree

Showing 28 changed files with 36,665 additions and 5,044 deletions.
diff --git a/Core.cpp b/Core.cpp
@@ -816,7 +816,7 @@ void Core::periodicSynchronizationWithIndex(const int &index)
             currentCopyInstance.interface->remainingTime(transferAddedTime*((double)currentCopyInstance.totalProgression/(double)currentCopyInstance.currentProgression-1)/1000);*/
 
         //do the speed calculation
-        if(currentCopyInstance.lastProgressionTime.isNull())
+        if(!currentCopyInstance.lastProgressionTime.isValid())
             currentCopyInstance.lastProgressionTime.start();
         else
         {

diff --git a/Core.h b/Core.h
@@ -11,7 +11,7 @@
 #include <QString>
 #include <QList>
 #include <QTimer>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QFile>
 #include <QUrl>
 #ifndef NOAUDIO
@@ -53,7 +53,7 @@ class Core : public QObject
         struct CopyInstance
         {
             unsigned int id;
-            QTime lastProgressionTime;//to compute the speed in B/s
+            QElapsedTimer lastProgressionTime;//to compute the speed in B/s
             PluginInterface_CopyEngine * engine;
             PluginInterface_Themes * interface;
             bool ignoreMode;
@@ -74,7 +74,7 @@ class Core : public QObject
             Ultracopier::CopyType type;
             Ultracopier::TransferListOperation transferListOperation;
             bool haveError;
-            QTime lastConditionalSync;
+            QElapsedTimer lastConditionalSync;
             QTimer *nextConditionalSync;
             bool copyEngineIsSync;
             bool canceled;//to not try groun when is in canceling

diff --git a/DebugEngine.h b/DebugEngine.h
@@ -12,8 +12,8 @@
 #include <string>
 #include <QFile>
 #include <QMutex>
-#include <QTime>
 #include <QTimer>
+#include <QElapsedTimer>
 #include <QList>
 #include <QCoreApplication>
 #include <QAbstractTableModel>
@@ -110,7 +110,7 @@ class DebugEngine : public QObject
         QMutex mutex;
         QMutex mutexList;
         /// \brief For record the start time
-        QTime startTime;
+        QElapsedTimer startTime;
         /// \brief String for the end of log file
         std::string endOfLogFile;
         /// \brief Drop the html entities

diff --git a/LocalListener.cpp b/LocalListener.cpp
@@ -303,7 +303,7 @@ void LocalListener::newConnexion()
     ComposedData newClient;
     newClient.socket = localServer.nextPendingConnection();
     #ifdef ULTRACOPIER_DEBUG
-    connect(newClient.socket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), this, &LocalListener::error);
+    connect(newClient.socket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::errorOccurred), this, &LocalListener::error);
     //connect(newClient.socket, &QLocalSocket::error, this, &LocalListener::error);
     //connect(newClient.socket, SIGNAL(error(QLocalSocket::LocalSocketError)), this, SLOT(error(QLocalSocket::LocalSocketError)));
     #endif

diff --git a/Version.h b/Version.h
@@ -2,8 +2,8 @@
 #define VERSIONUC_H
 
 /// \brief the version
-#define ULTRACOPIER_VERSION		"2.2.4.14"
+#define ULTRACOPIER_VERSION		"2.2.5.0"
 /// \brief the windows version
-#define ULTRACOPIER_WINDOWS_VERSION	2,2,4,14
+#define ULTRACOPIER_WINDOWS_VERSION	2,2,5,0
 
 #endif // VARIABLE_H
diff --git a/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp b/plugins/CopyEngine/Ultracopier-Spec/FolderExistsDialog.cpp
@@ -3,6 +3,7 @@
 #include "TransferThread.h"
 #include "../../../cpp11addition.h"
 #include <cstring>
+#include <QDateTime>
 
 #ifdef Q_OS_WIN32
 #define CURRENTSEPARATOR "\\"

diff --git a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.h
@@ -4,7 +4,7 @@
 \licence GPL3, see the file COPYING */
 
 #include <QObject>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QThread>
 
 #include <regex>
@@ -263,7 +263,7 @@ public slots:
     //different post-operation
     bool doFilePostOperation();
 protected:
-    QTime startTransferTime;
+    QElapsedTimer startTransferTime;
     bool haveTransferTime;
 };