Merge branch 'COVESA:master' into master

COVESA · Jan 7, 2025 · ebac03d · ebac03d
2 parents c3aa6f4 + 5a66b24
commit ebac03d
Show file tree

Hide file tree

Showing 24 changed files with 179 additions and 311 deletions.
diff --git a/plugin/dltdbusplugin/dltdbusplugin.cpp b/plugin/dltdbusplugin/dltdbusplugin.cpp
@@ -305,7 +305,7 @@ void DltDBusPlugin::selectedIdxMsg(int /*index*/, QDltMsg &msg)
     text += QString("<tr><td>Destination</td><td>%1</td></tr>").arg(dbusMsg.getDestination());
     text += QString("<tr><td>Sender</td><td>%1</td></tr>").arg(dbusMsg.getSender());
     QByteArray signature = dbusMsg.getSignature();
-    text += QString("<tr><td>Signature</td><td>%1</td></tr>").arg(msg.toAsciiTable(signature,false,false,true,256,256,false));
+    text += QString("<tr><td>Signature</td><td>%1</td></tr>").arg(QDlt::toAsciiTable(signature,false,false,true,256,256,false));
     text += QString("<tr><td>UnixFds</td><td>%1</td></tr>").arg(dbusMsg.getUnixFds());
 
     text += QString("</table>");
@@ -315,7 +315,7 @@ void DltDBusPlugin::selectedIdxMsg(int /*index*/, QDltMsg &msg)
     /* DBus message payload Hex*/
     QByteArray payload = dbusMsg.getPayload();
     text = QString("<h3>Size: %1</h3>").arg(payload.size());
-    text += msg.toAsciiTable(payload,true,true,false);
+    text += QDlt::toAsciiTable(payload,true,true,false);
     form->setTextBrowserPayloadHex(text);
 
     /* decode DBus payload */

diff --git a/plugin/dltviewerplugin/dltviewerplugin.cpp b/plugin/dltviewerplugin/dltviewerplugin.cpp
@@ -288,13 +288,13 @@ void DltViewerPlugin::selectedIdxMsg(int index, QDltMsg &msg) {
     QByteArray bytes_payload = msg.getPayload();
 
     /* Show Ascii output */
-    form->setTextBrowserAscii(msg.toAsciiTable(bytes_header,false,false,true,8,64)+msg.toAsciiTable(bytes_payload,false,false,true,8,64));
+    form->setTextBrowserAscii(QDlt::toAsciiTable(bytes_header,false,false,true,8,64)+QDlt::toAsciiTable(bytes_payload,false,false,true,8,64));
 
     /* Show Binary output */
-    form->setTextBrowserBinary(msg.toAsciiTable(bytes_header,true,true,false)+msg.toAsciiTable(bytes_payload,true,true,false));
+    form->setTextBrowserBinary(QDlt::toAsciiTable(bytes_header,true,true,false)+QDlt::toAsciiTable(bytes_payload,true,true,false));
 
     /* Show Mixed output */
-    form->setTextBrowserMixed(msg.toAsciiTable(bytes_header,true,true,true)+msg.toAsciiTable(bytes_payload,true,true,true));
+    form->setTextBrowserMixed(QDlt::toAsciiTable(bytes_header,true,true,true)+QDlt::toAsciiTable(bytes_payload,true,true,true));
 }
 
 

diff --git a/plugin/nonverboseplugin/nonverboseplugin.cpp b/plugin/nonverboseplugin/nonverboseplugin.cpp
@@ -636,7 +636,7 @@ bool NonverbosePlugin::decodeMsg(QDltMsg &msg, int triggeredByUser)
                 {
                     if((unsigned int)payload.size()<(offset+sizeof(unsigned short)))
                         break;
-                    if(argument.getEndianness() == QDltMsg::DltEndiannessLittleEndian)
+                    if(argument.getEndianness() == QDlt::DltEndiannessLittleEndian)
                         length = *((unsigned short*) (payload.constData()+offset));
                     else
                         length = DLT_SWAP_16(*((unsigned short*) (payload.constData()+offset)));

diff --git a/qdlt/CMakeLists.txt b/qdlt/CMakeLists.txt
@@ -42,7 +42,10 @@ add_library(qdlt SHARED
     fieldnames.cpp
     dltmessagematcher.cpp
     dltmessagematcher.h
-    qdltlrucache.hpp)
+    qdltlrucache.hpp
+    export_c_rules.h
+    export_rules.h
+)
 
 target_compile_definitions(qdlt PRIVATE
     BYTE_ORDER=LITTLE_ENDIAN

diff --git a/qdlt/dlt_common.h b/qdlt/dlt_common.h
@@ -64,7 +64,7 @@
 #ifndef DLT_COMMON_H
 #define DLT_COMMON_H
 
-#include "export_rules.h"
+#include "export_c_rules.h"
 
 /**
   \defgroup commonapi DLT Common API

diff --git a/qdlt/dlt_user.h b/qdlt/dlt_user.h
@@ -350,7 +350,7 @@ int dlt_user_trace_network(DltContext *handle, DltNetworkTraceType nw_trace_type
  * This function has to be called first, before using any DLT user lib functions.
  * @return negative value if there was an error
  */
-int dlt_init();
+int dlt_init(void);
 
 /**
  * Initialise the user lib writing only to file.

diff --git a/qdlt/export_c_rules.h b/qdlt/export_c_rules.h
@@ -0,0 +1,21 @@
+#ifndef EXPORT_C_RULES_H
+#define EXPORT_C_RULES_H
+
+/// \file export_c_rules.h
+/// \brief Export rules for C code to control symbols visibility
+
+#if defined(QDLT_LIBRARY)
+# if defined(_WIN32) || defined(_WIN64)
+#  define QDLT_C_EXPORT __declspec(dllexport)
+# else
+#  define QDLT_C_EXPORT __attribute__((visibility("default")))
+# endif
+#else
+# if defined(_WIN32) || defined(_WIN64)
+#  define QDLT_C_EXPORT __declspec(dllimport)
+# else
+#  define QDLT_C_EXPORT
+# endif
+#endif
+
+#endif // EXPORT_C_RULES_H
diff --git a/qdlt/export_rules.h b/qdlt/export_rules.h
@@ -1,20 +1,17 @@
 #ifndef EXPORT_RULES_H
 #define EXPORT_RULES_H
 
+/// \file export_rules.h
+/// \brief Export rules for C++ code to control symbols visibility
+/// \details This file is used to control the visibility of symbols in the shared library. See
+/// https://doc.qt.io/qt-5/sharedlibrary.html#using-symbols-from-shared-libraries for details
+
+#include <QtCore/QtGlobal>
+
 #if defined(QDLT_LIBRARY)
 # define QDLT_EXPORT Q_DECL_EXPORT
-# 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
-# if defined(_WIN32) || defined(_WIN64)
-#  define QDLT_C_EXPORT __declspec(dllimport)
-# else
-#  define QDLT_C_EXPORT
-# endif
 #endif
 
 #endif // EXPORT_RULES_H
diff --git a/qdlt/qdlt.pro b/qdlt/qdlt.pro
@@ -71,6 +71,7 @@ SOURCES +=  \
 
 HEADERS += qdlt.h \
     export_rules.h \
+    export_c_rules.h \
     dlt_common.h \
     dlt_user.h \
     qdltipconnection.h \