Rev.G. Fix compilation warnings under macos

robsonsmartins · Nov 21, 2023 · 3659129 · 3659129
1 parent e3cca27
commit 3659129
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 22 deletions.
diff --git a/software/usbflashprog/backend/epromfile/qatmelfile.cpp b/software/usbflashprog/backend/epromfile/qatmelfile.cpp
@@ -43,7 +43,7 @@ bool QAtmelFile::isReadable(const QString &filename) {
     return true;
 }
 
-QByteArray QAtmelFile::read(const QString &filename, qint64 size) {
+QByteArray QAtmelFile::read(const QString &filename, qint32 size) {
     QByteArray result;
     FILE *fd = fopen(filename.toStdString().c_str(), "r");
     if (fd == NULL) {
@@ -58,7 +58,8 @@ QByteArray QAtmelFile::read(const QString &filename, qint64 size) {
             ret != ATMEL_GENERIC_OK) { break; }
         if (address == -1) { address = arec.address; }
         if (arec.address - address + 2 > result.size()) {
-            result.append(QByteArray(arec.address - address
+            result.append(QByteArray(
+                static_cast<int>(arec.address - address)
                 + 2 - result.size(), 0xFF));
         }
         for (int i = 0; i < 2; i++) {

diff --git a/software/usbflashprog/backend/epromfile/qatmelfile.hpp b/software/usbflashprog/backend/epromfile/qatmelfile.hpp
@@ -53,7 +53,7 @@ class QAtmelFile: public QEpromFileBase {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    QByteArray read(const QString &filename, qint64 size);
+    QByteArray read(const QString &filename, qint32 size);
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/backend/epromfile/qbinfile.cpp b/software/usbflashprog/backend/epromfile/qbinfile.cpp
@@ -35,7 +35,7 @@ bool QBinFile::isReadable(const QString &filename) {
     return true;
 }
 
-QByteArray QBinFile::read(const QString &filename, qint64 size) {
+QByteArray QBinFile::read(const QString &filename, qint32 size) {
     QByteArray result;
     QFile file(filename);
     if (!file.open(QIODevice::ReadOnly)) {

diff --git a/software/usbflashprog/backend/epromfile/qbinfile.hpp b/software/usbflashprog/backend/epromfile/qbinfile.hpp
@@ -53,7 +53,7 @@ class QBinFile: public QEpromFileBase {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    QByteArray read(const QString &filename, qint64 size);
+    QByteArray read(const QString &filename, qint32 size);
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/backend/epromfile/qepromfile.cpp b/software/usbflashprog/backend/epromfile/qepromfile.cpp
@@ -27,7 +27,7 @@
 QEpromFile::QEpromFile(QObject *parent): QEpromFileBase(parent),
         eepromFile_(nullptr) {}
 
-QByteArray QEpromFile::read(const QString &filename, qint64 size) {
+QByteArray QEpromFile::read(const QString &filename, qint32 size) {
     if (QAtmelFile::isReadable(filename)) {
         type_ = EpromFileAtmel;
         eepromFile_.reset(new QAtmelFile());

diff --git a/software/usbflashprog/backend/epromfile/qepromfile.hpp b/software/usbflashprog/backend/epromfile/qepromfile.hpp
@@ -57,7 +57,7 @@ class QEpromFile: public QEpromFileBase {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    QByteArray read(const QString &filename, qint64 size);
+    QByteArray read(const QString &filename, qint32 size);
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/backend/epromfile/qepromfilebase.hpp b/software/usbflashprog/backend/epromfile/qepromfilebase.hpp
@@ -70,7 +70,7 @@ class QEpromFileBase: public QObject {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    virtual QByteArray read(const QString &filename, qint64 size) = 0;
+    virtual QByteArray read(const QString &filename, qint32 size) = 0;
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/backend/epromfile/qhexfile.cpp b/software/usbflashprog/backend/epromfile/qhexfile.cpp
@@ -47,7 +47,7 @@ bool QHexFile::isReadable(const QString &filename) {
     return true;
 }
 
-QByteArray QHexFile::read(const QString &filename, qint64 size) {
+QByteArray QHexFile::read(const QString &filename, qint32 size) {
     QByteArray result;
     FILE *fd = fopen(filename.toStdString().c_str(), "r");
     if (fd == NULL) {
@@ -66,7 +66,8 @@ QByteArray QHexFile::read(const QString &filename, qint64 size) {
         if (irec.dataLen) {
             if (address == 0) { address = irec.address; }
             if (irec.address - address + irec.dataLen > result.size()) {
-                result.append(QByteArray(irec.address - address
+                result.append(QByteArray(
+                    static_cast<int>(irec.address - address)
                     + irec.dataLen - result.size(), 0xFF));
             }
             for (int i = 0; i < irec.dataLen; i++) {

diff --git a/software/usbflashprog/backend/epromfile/qhexfile.hpp b/software/usbflashprog/backend/epromfile/qhexfile.hpp
@@ -53,7 +53,7 @@ class QHexFile: public QEpromFileBase {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    QByteArray read(const QString &filename, qint64 size);
+    QByteArray read(const QString &filename, qint32 size);
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/backend/epromfile/qsrecfile.cpp b/software/usbflashprog/backend/epromfile/qsrecfile.cpp
@@ -47,7 +47,7 @@ bool QSrecFile::isReadable(const QString &filename) {
     return true;
 }
 
-QByteArray QSrecFile::read(const QString &filename, qint64 size) {
+QByteArray QSrecFile::read(const QString &filename, qint32 size) {
     QByteArray result;
     FILE *fd = fopen(filename.toStdString().c_str(), "r");
     if (fd == NULL) {
@@ -66,7 +66,8 @@ QByteArray QSrecFile::read(const QString &filename, qint64 size) {
         if (srec.dataLen) {
             if (address == -1) { address = srec.address; }
             if (srec.address - address + srec.dataLen > result.size()) {
-                result.append(QByteArray(srec.address - address
+                result.append(QByteArray(
+                    static_cast<int>(srec.address - address)
                     + srec.dataLen - result.size(), 0xFF));
             }
             for (int i = 0; i < srec.dataLen; i++) {

diff --git a/software/usbflashprog/backend/epromfile/qsrecfile.hpp b/software/usbflashprog/backend/epromfile/qsrecfile.hpp
@@ -53,7 +53,7 @@ class QSrecFile: public QEpromFileBase {
      *   than this parameter, data is filled with 0xFF.
      * @return Byte array with data, or empty if an error occurs.
      */
-    QByteArray read(const QString &filename, qint64 size);
+    QByteArray read(const QString &filename, qint32 size);
     /**
      * @brief Writes data to a file.
      * @param type Type of the file to write.

diff --git a/software/usbflashprog/ui/qhexeditor.cpp b/software/usbflashprog/ui/qhexeditor.cpp
@@ -88,7 +88,7 @@ void QHexEditor::fill(quint8 value) {
 
 void QHexEditor::random(void) {
     QByteArray data;
-    for (qint64 i = 0; i < size_; i++) {
+    for (qint32 i = 0; i < size_; i++) {
         data += (QRandomGenerator::global()->bounded(256) & 0xFF);
     }
     QHexDocument *document =
@@ -98,7 +98,7 @@ void QHexEditor::random(void) {
     emit changed(true);
 }
 
-void QHexEditor::setSize(qint64 value) {
+void QHexEditor::setSize(qint32 value) {
     if (value == size_) { return; }
     QHexDocument *document = this->hexDocument();
     QByteArray data;
@@ -114,7 +114,7 @@ void QHexEditor::setSize(qint64 value) {
     size_ = value;
 }
 
-qint64 QHexEditor::size(void) const {
+qint32 QHexEditor::size(void) const {
     return size_;
 }
 
@@ -160,7 +160,7 @@ void QHexEditor::showReplaceDialog(void) {
     dialog.exec();
 }
 
-void QHexEditor::onDataChanged(const QByteArray& data, quint64 offset,
+void QHexEditor::onDataChanged(const QByteArray& data, quint32 offset,
                                QHexDocument::ChangeReason reason) {
     changed_ = true;
     emit changed();

diff --git a/software/usbflashprog/ui/qhexeditor.hpp b/software/usbflashprog/ui/qhexeditor.hpp
@@ -80,12 +80,12 @@ class QHexEditor : public QHexView {
      * @brief Sets the data size of the viewer.
      * @param value Data size, in bytes.
      */
-    void setSize(qint64 value);
+    void setSize(qint32 value);
     /**
      * @brief Gets the data size of the viewer.
      * @return Data size, in bytes.
      */
-    qint64 size(void) const;
+    qint32 size(void) const;
     /**
      * @brief Sets the bit grouping mode.
      * @param mode Bit grouping mode.
@@ -129,7 +129,7 @@ class QHexEditor : public QHexView {
      * @param offset Offset of changed data.
      * @param reason Reason of the change.
      */
-    void onDataChanged(const QByteArray& data, quint64 offset,
+    void onDataChanged(const QByteArray& data, quint32 offset,
                        QHexDocument::ChangeReason reason);
 
  private:
@@ -138,7 +138,7 @@ class QHexEditor : public QHexView {
     /* @brief Current filename. */
     QString filename_;
     /* @brief Data viewer size. */
-    qint64 size_;
+    qint32 size_;
     /* @brief Type of the current loaded file. */
     QEpromFile::QEpromFileType type_;
     /* @brief Editor mode. */