Qt6 support

IMSProg_editor/CMakeLists.txt

@@ -31,11 +31,15 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
-find_package(Qt5Widgets REQUIRED)
-
-# Qt5LinguistTools
-find_package(Qt5 REQUIRED COMPONENTS LinguistTools)
+find_package(Qt6 QUIET COMPONENTS Core Widgets)
+if (TARGET Qt6::Core AND TARGET Qt6::Widgets)
+    set(QT_VERSION_MAJOR 6)
+    find_package(Qt6LinguistTools REQUIRED)
+else()
+    # If QT6 not found, using QT5
+    find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets LinguistTools)
+    set(QT_VERSION_MAJOR 5)
+endif()
 
 # Translation files
 set(TS_FILES
@@ -50,7 +54,7 @@ set(TS_FILES
     language/chipEditor_it_IT.ts
 )
 
-qt5_add_translation(QM_FILES ${TS_FILES})
+qt_add_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations1 DEPENDS ${QM_FILES})
 
 add_executable(${PROJECT_NAME}
@@ -66,8 +70,8 @@ add_executable(${PROJECT_NAME}
 
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${PROJECT_NAME} Qt5::Core)
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
+target_link_libraries(${PROJECT_NAME} Qt::Core)
+target_link_libraries(${PROJECT_NAME} Qt::Widgets)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 

IMSProg_editor/ezp_chip_editor.cpp

@@ -248,7 +248,7 @@ QString MainWindow::bytePrint(unsigned char z)
     z = z % 16;
     if (z > 0x9) z = z + 0x37;
     else z = z + 0x30;
-    return QString(s) + QString(z);
+    return QString(static_cast<char>(s)) + QString(static_cast<char>(z));
 }
  QString MainWindow::sizeConvert(int a)
  {

IMSProg_editor/ezp_chip_editor.h

@@ -28,7 +28,7 @@
 #include <QFileDialog>
 #include <QByteArray>
 #include <QString>
-#include <QStringRef>
+#include <QStringView>
 #include <QDebug>
 #include <QTableView>
 #include <QStandardItemModel>

IMSProg_programmer/CMakeLists.txt

@@ -37,8 +37,15 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
-find_package(Qt5Widgets REQUIRED)
+find_package(Qt6 QUIET COMPONENTS Core Widgets)
+if (TARGET Qt6::Core AND TARGET Qt6::Widgets)
+    set(QT_VERSION_MAJOR 6)
+    find_package(Qt6LinguistTools REQUIRED)
+else()
+    # If QT6 not found, using QT5
+    find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets LinguistTools)
+    set(QT_VERSION_MAJOR 5)
+endif()
 find_package(LibUSB REQUIRED)
 
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -64,8 +71,6 @@ find_package(PkgConfig)
   endif()
 endif()
 endif()
-# Qt5LinguistTools
-find_package(Qt5 REQUIRED COMPONENTS LinguistTools)
 
 # Translation files
 set(TS_FILES
@@ -80,7 +85,7 @@ set(TS_FILES
     language/chipProgrammer_it_IT.ts
 )
 
-qt5_add_translation(QM_FILES ${TS_FILES})
+qt_add_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations DEPENDS ${QM_FILES})
 
 add_executable(${PROJECT_NAME}
@@ -168,8 +173,8 @@ ${QM_FILES}
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${PROJECT_NAME} Qt5::Core)
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets ${LibUSB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} Qt::Core)
+target_link_libraries(${PROJECT_NAME} Qt::Widgets ${LibUSB_LIBRARIES})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/IMSProg64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")

IMSProg_programmer/dialognandsr.cpp

@@ -19,7 +19,6 @@
 #include <QWidget>
 #include <QApplication>
 #include <QValidator>
-#include <QRegExp>
 #include <QString>
 #include <QStringList>
 #include "unistd.h"
@@ -52,8 +51,8 @@ DialogNANDSr::~DialogNANDSr()
 
 void DialogNANDSr::setLineEditFilter()
 {
-    QRegExp reHex( "[0-1]{1}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex( "[0-1]{1}" );
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(reHex, this);
     //searching all lineEdit_srXX, XX - numbers
     QString searchText = "lineEdit_sr\\d+";
         QRegularExpression regex(searchText);

IMSProg_programmer/dialogrp.cpp

@@ -16,7 +16,7 @@
 #include "ui_dialogrp.h"
 #include "mainwindow.h"
 #include <QValidator>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QDebug>
 #include <QString>
 DialogRP::DialogRP(QWidget *parent) :
@@ -25,8 +25,8 @@ DialogRP::DialogRP(QWidget *parent) :
 {
     ui->setupUi(this);
     setWindowFlags(Qt::Window| Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
-    QRegExp reHex( "[A-Fa-f0-9]{1,8}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex( "[A-Fa-f0-9]{1,8}" );
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(reHex, this);
     ui->lineEditStart->setValidator(validator);
 }
 

IMSProg_programmer/dialogsetaddr.cpp

@@ -15,7 +15,7 @@
 #include "dialogsetaddr.h"
 #include "ui_dialogsetaddr.h"
 #include <QValidator>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QString>
 
 DialogSetAddr::DialogSetAddr(QWidget *parent) :
@@ -24,8 +24,8 @@ DialogSetAddr::DialogSetAddr(QWidget *parent) :
 {
     ui->setupUi(this);
     setWindowFlags(Qt::Window | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
-    QRegExp reHex( "[A-Fa-f0-9]{1,8}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex( "[A-Fa-f0-9]{1,8}" );
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(reHex, this);
     ui->lineEditStart->setValidator(validator);
 }
 

IMSProg_programmer/dialogsfdp.cpp

@@ -15,7 +15,6 @@
 #include "dialogsfdp.h"
 #include "ui_dialogsfdp.h"
 #include <QValidator>
-#include <QRegExp>
 #include "unistd.h"
 #include "memory"
 #include <QDebug>
@@ -438,8 +437,8 @@ void DialogSFDP::on_pushButton_3_clicked()
 
 void DialogSFDP::setLineEditFilter()
 {
-    QRegExp reHex( "[0-1]{1}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex( "[0-1]{1}" );
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(reHex, this);
     //searching all lineEdit_srXX, XX - numbers
     QString searchText = "lineEdit_sr\\d+";
         QRegularExpression regex(searchText);

IMSProg_programmer/dialogsp.cpp

@@ -13,22 +13,22 @@
  * GNU General Public License for more details.
  */
 #include "dialogsp.h"
-#include "ui_dialogsp.h"
 #include "mainwindow.h"
-#include <QValidator>
-#include <QRegExp>
+#include "ui_dialogsp.h"
 #include <QDebug>
+#include <QRegularExpression>
 #include <QString>
-DialogSP::DialogSP(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::DialogSP)
+#include <QValidator>
+DialogSP::DialogSP(QWidget* parent)
+    : QDialog(parent)
+    , ui(new Ui::DialogSP)
 {
     ui->setupUi(this);
     setWindowFlags(Qt::Window | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
     ui->comboBox_end->addItem(tr("End address"), 0);
     ui->comboBox_end->addItem(tr("Length"), 1);
-    QRegExp reHex( "[A-Fa-f0-9]{1,8}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex("[A-Fa-f0-9]{1,8}");
+    QRegularExpressionValidator* validator = new QRegularExpressionValidator(reHex, this);
     ui->lineEditStart->setValidator(validator);
     ui->lineEditEnd->setValidator(validator);
 }
@@ -41,8 +41,10 @@ DialogSP::~DialogSP()
 void DialogSP::on_pushButton_clicked()
 {
 
-    if (ui->comboBox_end->currentData() == 0) addrData = QString(ui->lineEditStart->text() + "-" + ui->lineEditEnd->text() + "*");
-    else addrData = QString(ui->lineEditStart->text() + "-" + ui->lineEditEnd->text() + "#");
+    if (ui->comboBox_end->currentData() == 0)
+        addrData = QString(ui->lineEditStart->text() + "-" + ui->lineEditEnd->text() + "*");
+    else
+        addrData = QString(ui->lineEditStart->text() + "-" + ui->lineEditEnd->text() + "#");
     emit sendAddr(addrData);
     DialogSP::close();
 }

IMSProg_programmer/dialogsr.cpp

@@ -15,7 +15,7 @@
 #include "dialogsr.h"
 #include "ui_dialogsr.h"
 #include <QValidator>
-#include <QRegExp>
+#include <QRegularExpression>
 #include "unistd.h"
 #include <QDebug>
 
@@ -115,8 +115,8 @@ void DialogSR::on_pushButton_write_clicked()
 
 void DialogSR::setLineEditFilter()
 {
-    QRegExp reHex( "[0-1]{1}" );
-    QRegExpValidator *validator = new QRegExpValidator(reHex, this);
+    QRegularExpression reHex( "[0-1]{1}" );
+    QRegularExpressionValidator *validator = new QRegularExpressionValidator(reHex, this);
     ui->lineEdit_sr00->setValidator(validator);
     ui->lineEdit_sr01->setValidator(validator);
     ui->lineEdit_sr02->setValidator(validator);

IMSProg_programmer/main.cpp

@@ -17,7 +17,6 @@
 
 int main(int argc, char *argv[])
 {
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QFont font("Monospace");
     font.setStyleHint(QFont::TypeWriter);
     font.setPointSize(12);