app: initial changes to port to Qt 6

Signed-off-by: Bartłomiej Burdukiewicz <[email protected]>

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.26)
 
 project(fdt-viewer VERSION 0.8.1 LANGUAGES CXX)
 
@@ -8,11 +8,11 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt5 COMPONENTS Widgets)
-if (Qt5_FOUND)
+find_package(Qt6 COMPONENTS Widgets Core)
+if (Qt6_FOUND)
 	add_subdirectory("src")
 
 	if (UNIX)

src/CMakeLists.txt

@@ -27,5 +27,5 @@ add_executable(fdt-viewer
     ../resources.qrc
 )
 
-target_link_libraries(fdt-viewer PRIVATE Qt5::Widgets qhexview-lib)
+target_link_libraries(fdt-viewer PRIVATE Qt6::Widgets Qt6::Core QHexView)
 install(TARGETS fdt-viewer RUNTIME DESTINATION bin)

src/endian-conversions.hpp

@@ -5,22 +5,19 @@
 #include <bit>
 #include <cstring>
 
-constexpr u32 u32_be(const char *data) noexcept {
-    if constexpr (std::endian::native == std::endian::big)
-        return *reinterpret_cast<const u32 *>(data);
-
-    if constexpr (std::endian::native == std::endian::little)
-        return __builtin_bswap32(*reinterpret_cast<const u32 *>(data));
-
-    return 0;
+template <std::integral T>
+constexpr T byteswap(T value) noexcept {
+    static_assert(std::has_unique_object_representations_v<T>,
+        "T may not have padding bits");
+    auto value_representation = std::bit_cast<std::array<std::byte, sizeof(T)>>(value);
+    std::ranges::reverse(value_representation);
+    return std::bit_cast<T>(value_representation);
 }
 
-constexpr u32 u32_be(const u32 data) noexcept {
-    if constexpr (std::endian::native == std::endian::big)
-        return data;
-
+template <std::integral T>
+T convert(const T data) noexcept {
     if constexpr (std::endian::native == std::endian::little)
-        return __builtin_bswap32(data);
+        return byteswap(data);
 
     return data;
 }
@@ -31,6 +28,6 @@ constexpr type read_data_32be(input_data *input) noexcept {
     std::memcpy(reinterpret_cast<void *>(&container), reinterpret_cast<const void *>(input), sizeof(type));
     auto *data = reinterpret_cast<u32 *>(&container);
     for (auto i = 0; i < (sizeof(type) / sizeof(u32)); ++i)
-        data[i] = u32_be(data[i]);
+        data[i] = convert<u32>(data[i]);
     return container;
 }

src/fdt/fdt-parser.cpp

@@ -39,7 +39,7 @@ void fdt_parser::parse(const fdt::header header, iface_fdt_generator &generator)
             return iter += size;
         };
 
-        const auto token = static_cast<fdt::token>(u32_be(iter));
+        const auto token = static_cast<fdt::token>(convert(*reinterpret_cast<const u32 *>(iter)));
         seek_and_align(sizeof(token));
 
         if (fdt::token::begin_node == token) {

src/fdt/fdt-view.cpp

@@ -47,16 +47,16 @@ string present(const fdt_property &property) {
             return result_str({data});
 
         if (property_type::number == info.type)
-            return result(string::number(u32_be(data.data())));
+            return result(string::number(convert(*reinterpret_cast<const u32 *>(data.data()))));
     }
 
-    const static regexp cells_regexp("^#.*-cells$");
-    const static regexp names_regexp("^.*-names");
+    const static QRegularExpression cells_regexp("^#.*-cells$");
+    const static QRegularExpression names_regexp("^.*-names");
 
-    if (cells_regexp.exactMatch(name))
-        return result(string::number(u32_be(data.data())));
+    if (cells_regexp.match(name).hasMatch())
+        return result(string::number(convert(*reinterpret_cast<const u32 *>(data.data()))));
 
-    if (names_regexp.exactMatch(name)) {
+    if (names_regexp.match(name).hasMatch()) {
         auto lines = data.split(0);
         lines.removeLast();
 

src/main-window.cpp

@@ -16,9 +16,8 @@
 #include <menu-manager.hpp>
 #include <viewer-settings.hpp>
 
-#include <document/buffer/qmemorybuffer.h>
-#include <document/qhexdocument.h>
-#include <qhexview.h>
+#include "submodules/qhexview/model/buffer/qmemorybuffer.h"
+#include "submodules/qhexview/qhexview.h"
 
 using namespace Window;
 

src/types.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <cstdint>
+#include <QStringList>
+#include <QRegularExpression>
 
 using i16 = std::int16_t;
 using i32 = std::int32_t;
@@ -21,7 +23,6 @@ class QFile;
 class QFileInfo;
 class QRegExp;
 class QString;
-class QStringList;
 class QTreeWidget;
 class QTreeWidgetItem;
 class QWidget;
@@ -33,7 +34,6 @@ using byte_array = QByteArray;
 using dir_iterator = QDirIterator;
 using file = QFile;
 using file_info = QFileInfo;
-using regexp = QRegExp;
 using string = QString;
 using string_list = QStringList;
 using tree_widget = QTreeWidget;