Porting to the Qt 6 framework and fixing some errors.

.gitignore

@@ -40,3 +40,6 @@ lib/*
 *.idb
 *.ncb
 *.suo
+
+*.cppcheck
+/*-cppcheck-build-dir

README.md

@@ -24,13 +24,15 @@ Microsoft Office and can be used in any platform that **Qt 5.2** or newer suppor
 
 * Put the source code in any directory you like
 
-* Run following command at the toplevel directory of the project
+* Run following command at the toplevel directory of the project:
+
+|                    | Windows Qt MINGW           | Windows Qt MSVC     |
+|--------------------|----------------------------|---------------------|
+| ```qmake```        | ```qmake```                | ```qmake```         |
+| ```make```         | ```mingw32-make```         | ```nmake```         |
+|                    | ```mingw32-make check```   | ```nmake check```   |
+| ```make install``` | ```mingw32-make install``` | ```nmake install``` |
 
-```
-    qmake
-    make
-    make install
-```
 
 The library, the header files, and others will be installed to your system.
 

examples/officeopenxml/opc_package_viewer/binedit.cpp

@@ -89,7 +89,7 @@ BinEdit::BinEdit(QWidget *parent)
     m_addressBytes = 4;
     init();
     m_unmodifiedState = 0;
-    m_readOnly = false;
+    m_readOnly = 0;
     m_hexCursor = true;
     m_cursorPosition = 0;
     m_anchorPosition = 0;
@@ -130,27 +130,63 @@ void BinEdit::init()
     m_descent = fm.descent();
     m_ascent = fm.ascent();
     m_lineHeight = fm.lineSpacing();
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+    m_charWidth = fm.horizontalAdvance(QChar(QLatin1Char('M')));
+    m_margin = m_charWidth;
+    m_columnWidth = 2 * m_charWidth + fm.horizontalAdvance(QChar(QLatin1Char(' ')));
+#else
     m_charWidth = fm.width(QChar(QLatin1Char('M')));
     m_margin = m_charWidth;
     m_columnWidth = 2 * m_charWidth + fm.width(QChar(QLatin1Char(' ')));
+#endif
+
     m_numLines = m_size / m_bytesPerLine + 1;
     m_numVisibleLines = viewport()->height() / m_lineHeight;
     m_textWidth = m_bytesPerLine * m_charWidth + m_charWidth;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+    int m_numberWidth = fm.horizontalAdvance(QChar(QLatin1Char('9')));
+#else
     int m_numberWidth = fm.width(QChar(QLatin1Char('9')));
+#endif
     m_labelWidth =
         2*m_addressBytes * m_numberWidth + (m_addressBytes - 1)/2 * m_charWidth;
 
     int expectedCharWidth = m_columnWidth / 3;
     const char *hex = "0123456789abcdef";
     m_isMonospacedFont = true;
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+    while (*hex) {
+        if (fm.horizontalAdvance(QLatin1Char(*hex)) != expectedCharWidth) {
+            m_isMonospacedFont = false;
+            break;
+        }
+        ++hex;
+    }
+#else
     while (*hex) {
         if (fm.width(QLatin1Char(*hex)) != expectedCharWidth) {
             m_isMonospacedFont = false;
             break;
         }
         ++hex;
     }
+#endif
+
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+    if (m_isMonospacedFont && fm.horizontalAdvance(QLatin1String("M M ")) != m_charWidth * 4) {
+        // On Qt/Mac, monospace font widths may have a fractional component
+        // This breaks the assumption that width("MMM") == width('M') * 3
 
+        m_isMonospacedFont = false;
+        m_columnWidth = fm.horizontalAdvance(QLatin1String("MMM"));
+        m_labelWidth = m_addressBytes == 4
+            ? fm.horizontalAdvance(QLatin1String("MMMM:MMMM"))
+            : fm.horizontalAdvance(QLatin1String("MMMM:MMMM:MMMM:MMMM"));
+    }
+#else
     if (m_isMonospacedFont && fm.width(QLatin1String("M M ")) != m_charWidth * 4) {
         // On Qt/Mac, monospace font widths may have a fractional component
         // This breaks the assumption that width("MMM") == width('M') * 3
@@ -161,6 +197,7 @@ void BinEdit::init()
             ? fm.width(QLatin1String("MMMM:MMMM"))
             : fm.width(QLatin1String("MMMM:MMMM:MMMM:MMMM"));
     }
+#endif
 
     horizontalScrollBar()->setRange(0, 2 * m_margin + m_bytesPerLine * m_columnWidth
                                     + m_labelWidth + m_textWidth - viewport()->width());
@@ -461,7 +498,11 @@ void BinEdit::changeEvent(QEvent *e)
 void BinEdit::wheelEvent(QWheelEvent *e)
 {
     if (e->modifiers() & Qt::ControlModifier) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+        const int delta = e->pixelDelta().y();
+#else
         const int delta = e->delta();
+#endif
         if (delta < 0)
             zoomOut();
         else if (delta > 0)
@@ -505,8 +546,12 @@ int BinEdit::posAt(const QPoint &pos) const
                 break;
             QChar qc(QLatin1Char(dataAt(dataPos)));
             if (!qc.isPrint())
-                qc = 0xB7;
+                qc = QChar(0xB7);
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+            x -= fontMetrics().horizontalAdvance(qc);
+#else
             x -= fontMetrics().width(qc);
+#endif
             if (x <= 0)
                 break;
         }
@@ -787,7 +832,7 @@ void BinEdit::paintEvent(QPaintEvent *e)
                     break;
                 QChar qc(QLatin1Char(dataAt(pos, isOld)));
                 if (qc.unicode() >= 127 || !qc.isPrint())
-                    qc = 0xB7;
+                    qc = QChar(0xB7);
                 printable += qc;
             }
         } else {
@@ -830,20 +875,36 @@ void BinEdit::paintEvent(QPaintEvent *e)
 
                 if (color.isValid()) {
                     painter.fillRect(item_x - m_charWidth/2, y-m_ascent, m_columnWidth, m_lineHeight, color);
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+                    int printable_item_x = -xoffset + m_margin + m_labelWidth + m_bytesPerLine * m_columnWidth + m_charWidth
+                                           + fm.horizontalAdvance(printable.left(c));
+                    painter.fillRect(printable_item_x, y-m_ascent,
+                                     fm.horizontalAdvance(printable.at(c)),
+                                     m_lineHeight, color);
+#else
                     int printable_item_x = -xoffset + m_margin + m_labelWidth + m_bytesPerLine * m_columnWidth + m_charWidth
                                            + fm.width(printable.left(c));
                     painter.fillRect(printable_item_x, y-m_ascent,
                                      fm.width(printable.at(c)),
                                      m_lineHeight, color);
+#endif
                 }
 
                 if (!isFullySelected && pos >= selStart && pos <= selEnd) {
                     selectionRect |= QRect(item_x - m_charWidth/2, y-m_ascent, m_columnWidth, m_lineHeight);
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+                    int printable_item_x = -xoffset + m_margin + m_labelWidth + m_bytesPerLine * m_columnWidth + m_charWidth
+                                           + fm.horizontalAdvance(printable.left(c));
+                    printableSelectionRect |= QRect(printable_item_x, y-m_ascent,
+                                                    fm.horizontalAdvance(printable.at(c)),
+                                                    m_lineHeight);
+#else
                     int printable_item_x = -xoffset + m_margin + m_labelWidth + m_bytesPerLine * m_columnWidth + m_charWidth
                                            + fm.width(printable.left(c));
                     printableSelectionRect |= QRect(printable_item_x, y-m_ascent,
                                                     fm.width(printable.at(c)),
                                                     m_lineHeight);
+#endif
                 }
             }
         }
@@ -878,8 +939,13 @@ void BinEdit::paintEvent(QPaintEvent *e)
             painter.drawRect(cursorRect.adjusted(0, 0, 0, -1));
             painter.restore();
             if (m_hexCursor && m_cursorVisible) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+                if (m_lowNibble)
+                    cursorRect.adjust(fm.horizontalAdvance(itemString.left(1)), 0, 0, 0);
+#else
                 if (m_lowNibble)
                     cursorRect.adjust(fm.width(itemString.left(1)), 0, 0, 0);
+#endif
                 painter.fillRect(cursorRect, Qt::red);
                 painter.save();
                 painter.setClipRect(cursorRect);
@@ -893,8 +959,13 @@ void BinEdit::paintEvent(QPaintEvent *e)
 
         if (isFullySelected) {
                 painter.save();
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+                painter.fillRect(text_x, y-m_ascent, fm.horizontalAdvance(printable), m_lineHeight,
+                                 palette().highlight());
+#else
                 painter.fillRect(text_x, y-m_ascent, fm.width(printable), m_lineHeight,
                                  palette().highlight());
+#endif
                 painter.setPen(palette().highlightedText().color());
                 painter.drawText(text_x, y, printable);
                 painter.restore();
@@ -911,10 +982,17 @@ void BinEdit::paintEvent(QPaintEvent *e)
         }
 
         if (cursor >= 0 && !printable.isEmpty()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+            QRect cursorRect(text_x + fm.horizontalAdvance(printable.left(cursor)),
+                             y-m_ascent,
+                             fm.horizontalAdvance(printable.at(cursor)),
+                             m_lineHeight);
+#else
             QRect cursorRect(text_x + fm.width(printable.left(cursor)),
                              y-m_ascent,
                              fm.width(printable.at(cursor)),
                              m_lineHeight);
+#endif
             painter.save();
             if (m_hexCursor || !m_cursorVisible) {
                 painter.setPen(Qt::red);
@@ -1216,7 +1294,7 @@ QString BinEdit::toolTip(const QHelpEvent *helpEvent) const
         asDouble(selStart, doubleValueOld, true);
         str << tableRowStartC << tr("<i>double</i>&nbsp;value:") << numericTableRowSepC
             << doubleValue << tableRowEndC;
-        if (doubleValue != doubleValueOld)
+        if (!qFuzzyCompare(doubleValue, doubleValueOld))
             str << tableRowStartC << tr("Previous <i>double</i>&nbsp;value:") << numericTableRowSepC
                 << doubleValueOld << tableRowEndC;
         str << "</table>";
@@ -1230,7 +1308,7 @@ QString BinEdit::toolTip(const QHelpEvent *helpEvent) const
         asFloat(selStart, floatValueOld, true);
         str << tableRowStartC << tr("<i>float</i>&nbsp;value:") << numericTableRowSepC
             << floatValue << tableRowEndC;
-        if (floatValue != floatValueOld)
+        if (!qFuzzyCompare(floatValue, floatValueOld))
             str << tableRowStartC << tr("Previous <i>float</i>&nbsp;value:") << numericTableRowSepC
                 << floatValueOld << tableRowEndC;
 
@@ -1330,7 +1408,7 @@ void BinEdit::keyPressEvent(QKeyEvent *e)
             } else {
                 if (c.unicode() >= 128 || !c.isPrint())
                     continue;
-                changeData(m_cursorPosition, c.unicode(), m_cursorPosition + 1);
+                changeData(m_cursorPosition, c.unicode(), true);
                 setCursorPosition(m_cursorPosition + 1);
             }
             setBlinkingCursorEnabled(true);

examples/officeopenxml/opc_package_viewer/binedit.h

@@ -88,7 +88,7 @@ class BinEdit : public QAbstractScrollArea
     bool isReadOnly() const;
 
     int find(const QByteArray &pattern, int from = 0,
-             QTextDocument::FindFlags findFlags = 0);
+             QTextDocument::FindFlags findFlags = QTextDocument::FindFlags());
 
     void selectAll();
     void clear();
@@ -110,7 +110,7 @@ class BinEdit : public QAbstractScrollArea
 
 public Q_SLOTS:
     void highlightSearchResults(const QByteArray &pattern,
-        QTextDocument::FindFlags findFlags = 0);
+                                QTextDocument::FindFlags findFlags = QTextDocument::FindFlags());
     void copy(bool raw = false);
     void setNewWindowRequestAllowed(bool c);
 

examples/officeopenxml/opc_package_viewer/imagewidget.cpp

@@ -64,6 +64,7 @@ ImageWidgetPrivate::ImageWidgetPrivate(ImageWidget *q) :
     m_scaleMax = 64;
     m_wheelScaleEnabled = true;
     m_autoAdjustEnabled = false;
+    m_pixmapItem = nullptr;
 }
 
 /*!
@@ -195,7 +196,7 @@ bool ImageWidget::isMouseWheelEnabled() const
 */
 void ImageWidget::setCurrentScale(double factor)
 {
-    if (factor == 0) {
+    if (qFuzzyCompare(factor, 0)) {
         if (!d->m_autoAdjustEnabled) {
             d->m_autoAdjustEnabled = true;
             d->doAutoFit();
@@ -245,8 +246,11 @@ void ImageWidget::wheelEvent(QWheelEvent *event)
     if (d->m_wheelScaleEnabled) {
         //Disable auto fit!!
         d->m_autoAdjustEnabled = false;
-
+#if (QT_VERSION >= QT_VERSION_CHECK(5,15,14))
+        double numDegrees = -event->angleDelta().y() / 8.0;
+#else
         double numDegrees = -event->delta() / 8.0;
+#endif
         double numSteps = numDegrees / 15.0;
         double factor = pow(1.125, numSteps);
 

examples/officeopenxml/opc_packages_diff/mainwindow.cpp

@@ -142,7 +142,7 @@ void MainWindow::onRunButtonClicked()
         return;
     }
 
-    QStringList args = ui->diffArgumentsEdit->text().split(QRegularExpression("\\s+"), QString::SkipEmptyParts);
+    QStringList args = ui->diffArgumentsEdit->text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
     for (int i=0; i<args.size(); ++i) {
         if (args[i] == QLatin1String("%1"))
             args[i] = m_dir1->path();

src/3rdParty/karchive/src/karchive.cpp

@@ -172,7 +172,7 @@ bool KArchive::close()
         closeSucceeded = d->saveFile->commit();
         delete d->saveFile;
         d->saveFile = 0;
-    } if (d->deviceOwned) {
+    } else if (d->deviceOwned) {
         delete d->dev; // we created it ourselves in open()
     }
 
@@ -234,9 +234,15 @@ bool KArchive::addLocalFile(const QString &fileName, const QString &destName)
         if (symLinkTarget.isEmpty()) { // Mac or Windows
             symLinkTarget = fileInfo.symLinkTarget();
         }
+        QDateTime fileWasCreated;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0))
+        fileWasCreated = fileInfo.birthTime();
+#else
+        fileWasCreated = fileInfo.created();
+#endif
         return writeSymLink(destName, symLinkTarget, fileInfo.owner(),
                             fileInfo.group(), fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(),
-                            fileInfo.created());
+                            fileWasCreated);
     }/*end if*/
 
     qint64 size = fileInfo.size();
@@ -249,9 +255,14 @@ bool KArchive::addLocalFile(const QString &fileName, const QString &destName)
         //qWarning() << "couldn't open file " << fileName;
         return false;
     }
-
+    QDateTime fileWasCreated;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0))
+    fileWasCreated = fileInfo.birthTime();
+#else
+    fileWasCreated = fileInfo.created();
+#endif
     if (!prepareWriting(destName, fileInfo.owner(), fileInfo.group(), size,
-                        fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(), fileInfo.created())) {
+                        fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(), fileWasCreated)) {
         //qWarning() << " prepareWriting" << destName << "failed";
         return false;
     }
@@ -316,9 +327,11 @@ bool KArchive::writeFile(const QString &name, const QByteArray &data,
 
     // Write data
     // Note: if data is null, don't call write, it would terminate the KCompressionDevice
-    if (data.constData() && size && !writeData(data.constData(), size)) {
-        //qWarning() << "writeData failed";
-        return false;
+    if (!data.isNull() && !data.isEmpty()) {
+        if (!writeData(data.constData(), size)) {
+            //qWarning() << "writeData failed";
+            return false;
+        }
     }
 
     if (!finishWriting(size)) {
@@ -515,7 +528,13 @@ QDateTime KArchivePrivate::time_tToDateTime(uint time_t)
     if (time_t == uint(-1)) {
         return QDateTime();
     }
-    return QDateTime::fromTime_t(time_t);
+    QDateTime retVal;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0))
+    retVal = QDateTime::fromSecsSinceEpoch(time_t);
+#else
+    retVal = QDateTime::fromTime_t(time_t);
+#endif
+    return retVal;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -874,9 +893,11 @@ bool KArchiveDirectory::copyTo(const QString &dest, bool recursiveCopy) const
             }
         }
     } while (!dirStack.isEmpty());
-
+#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0))
+    std::sort(fileList.begin(), fileList.end(), sortByPosition);    // sort on d->pos, so we have a linear access
+#else
     qSort(fileList.begin(), fileList.end(), sortByPosition);    // sort on d->pos, so we have a linear access
-
+#endif
     for (QList<const KArchiveFile *>::const_iterator it = fileList.constBegin(), end = fileList.constEnd();
             it != end; ++it) {
         const KArchiveFile *f = *it;