Merge pull request #6 from COVESA/update

sync
bunty95 · Dec 12, 2024 · 1afdc8e · 1afdc8e
2 parents bb9c334 + 360810d
commit 1afdc8e
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 479 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,8 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+set(CMAKE_C_STANDARD 11)
+
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()

diff --git a/build_sdk_windows_qt5_MSVC_interactive_qmake.bat b/build_sdk_windows_qt5_MSVC_interactive_qmake.bat
diff --git a/build_sdk_windows_qt5_MSVC_qmake.bat b/build_sdk_windows_qt5_MSVC_qmake.bat
diff --git a/plugin/dlttestrobotplugin/dlttestrobotplugin.cpp b/plugin/dlttestrobotplugin/dlttestrobotplugin.cpp
@@ -108,16 +108,7 @@ bool DltTestRobotPlugin::controlMsg(int , QDltMsg &)
     return false;
 }
 
-bool DltTestRobotPlugin::stateChanged(int index, QDltConnection::QDltConnectionState connectionState,QString hostname){
-    Q_UNUSED(index)
-    Q_UNUSED(connectionState)
-    Q_UNUSED(hostname)
-
-#if QT_5_SUPPORTED_VERSION
-    //qDebug() << ecuList->at(index) << "ConnectionState:" << connectionState << "Hostname:" << hostname << Qt::endl;
-#else
-    //qDebug() << ecuList->at(index) << "ConnectionState:" << connectionState << "Hostname:" << hostname << endl;
-#endif
+bool DltTestRobotPlugin::stateChanged(int, QDltConnection::QDltConnectionState, QString) {
     return true;
 }
 

diff --git a/qdlt/dlt_types.h b/qdlt/dlt_types.h
@@ -59,7 +59,7 @@
 typedef int pid_t;
 #endif
 
-#ifdef TARGET_OS_MAC
+#ifdef __APPLE__
 typedef unsigned long speed_t;
 #else
 typedef unsigned int speed_t;

diff --git a/qdlt/dlt_user.h b/qdlt/dlt_user.h
@@ -71,7 +71,6 @@
   \{
 */
 
-#include "dlt_types.h"
 #include "dlt_common.h"
 
 #ifdef __cplusplus

diff --git a/qdlt/export_rules.h b/qdlt/export_rules.h
@@ -1,24 +1,20 @@
-#include <QtGlobal>
-
 #ifndef EXPORT_RULES_H
 #define EXPORT_RULES_H
 
 #if defined(QDLT_LIBRARY)
 # define QDLT_EXPORT Q_DECL_EXPORT
-# ifdef Q_OS_WIN
+# if defined(_WIN32) || defined(_WIN64)
 #  define QDLT_C_EXPORT __declspec(dllexport)
 # else
 #  define QDLT_C_EXPORT __attribute__((visibility("default")))
 # endif
 #else
 # define QDLT_EXPORT Q_DECL_IMPORT
-# ifdef Q_OS_WIN
+# if defined(_WIN32) || defined(_WIN64)
 #  define QDLT_C_EXPORT __declspec(dllimport)
 # else
 #  define QDLT_C_EXPORT
 # endif
 #endif
 
-#define QT_5_SUPPORTED_VERSION (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR >= 14) || (QT_VERSION_MAJOR >= 6)
-
 #endif // EXPORT_RULES_H
diff --git a/qdlt/qdltsegmentedmsg.h b/qdlt/qdltsegmentedmsg.h
@@ -25,7 +25,6 @@
 #include "export_rules.h"
 
 #include <qdltmsg.h>
-#include <dlt_types.h>
 
 //! Combine segmented network messages
 /*!

diff --git a/src/dltfileindexer.cpp b/src/dltfileindexer.cpp
@@ -151,7 +151,6 @@ bool DltFileIndexer::index(int num)
     quint8 version=1;
     qint64 lengthOffset=2;
     qint64 storageLength=0;
-    int iPercent =0;
     errors_in_file  = 0;
     char *data = new char[DLT_FILE_INDEXER_SEG_SIZE];
 
@@ -378,7 +377,6 @@ bool DltFileIndexer::indexFilter(QStringList filenames)
 {
     QSharedPointer<QDltMsg> msg;
     QDltFilterList filterList;
-    QTime time;
     quint64 ix = 0;
     unsigned int iPercent = 0;
 
@@ -429,12 +427,6 @@ bool DltFileIndexer::indexFilter(QStringList filenames)
         return true;
     }
 
-    unsigned int modvalue = dltFile->size()/20;
-    if (modvalue == 0) // avoid divison by zero
-    {
-        modvalue = 1;
-    }
-
     // Initialise progress bar
     emit(progressText(QString("CFI %1/%2").arg(currentRun).arg(maxRun)));
     emit(progressMax(100));
@@ -470,7 +462,7 @@ bool DltFileIndexer::indexFilter(QStringList filenames)
     qDebug() << "Create filter index: Start";
 
     /* init fileprogress */
-    int progressCounter = 1;
+    unsigned int progressCounter = 1;
     emit progress(0);
 
     // Start reading messages
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ @@
       \{
     */
-    #include "dlt_types.h"
     #include "dlt_common.h"
     #ifdef __cplusplus
@@ Expand Down @@