r24871 by jghali - Qt6: qHash now returns size_t

[scribus-commit]

Author: jghali
Date: Mon Jan 31 00:45:08 2022
New Revision: 24871

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24871
Log:
Qt6: qHash now returns size_t

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/sclayer.cpp
    trunk/Scribus/scribus/sclayer.h
    trunk/Scribus/scribus/tablecell.h

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24871&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp       (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp       Mon Jan 31 00:45:08 2022
@@ -1660,7 +1660,7 @@
 
 QByteArray PDFLibCore::PDF_GenerateSubsetTag(const QByteArray& fontName, const 
QList<uint>& usedGlyphs)
 {
-       uint hash, mod;
+       size_t hash, mod;
        QVector<uint> glyphVec = usedGlyphs.toVector();
 
        hash = qHashBits(fontName.constData(), fontName.size(), 0);

Modified: trunk/Scribus/scribus/pslib.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24871&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp     (original)
+++ trunk/Scribus/scribus/pslib.cpp     Mon Jan 31 00:45:08 2022
@@ -660,7 +660,7 @@
                                        return false;
                        }
                }
-               uint patHash = qHash(patternName);
+               size_t patHash = qHash(patternName);
                PutStream("/Pattern" + QString::number(patHash) + " 8 dict 
def\n");
                PutStream("Pattern" + QString::number(patHash) + " begin\n");
                PutStream("/PatternType 1 def\n");
@@ -2866,7 +2866,7 @@
        QTransform patternMatrix;
        double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, 
patternRotation, patternSkewX, patternSkewY, patternSpace;
        pat = &m_Doc->docPatterns[item->strokePattern()];
-       uint patHash = qHash(item->strokePattern());
+       size_t patHash = qHash(item->strokePattern());
        item->strokePatternTransform(patternScaleX, patternScaleY, 
patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, 
patternSpace);
        patternMatrix.translate(-item->lineWidth() / 2.0, item->lineWidth() / 
2.0);
        patternMatrix.translate(patternOffsetX, -patternOffsetY);
@@ -3618,7 +3618,7 @@
                        QTransform patternMatrix;
                        double patternScaleX, patternScaleY, patternOffsetX, 
patternOffsetY, patternRotation, patternSkewX, patternSkewY;
                        ScPattern *pat = &m_Doc->docPatterns[item->pattern()];
-                       uint patHash = qHash(item->pattern());
+                       size_t patHash = qHash(item->pattern());
                        item->patternTransform(patternScaleX, patternScaleY, 
patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY);
                        patternMatrix.translate(patternOffsetX, 
-patternOffsetY);
                        patternMatrix.rotate(-patternRotation);
@@ -4011,7 +4011,7 @@
                        QTransform patternMatrix;
                        double patternScaleX, patternScaleY, patternOffsetX, 
patternOffsetY, patternRotation, patternSkewX, patternSkewY, patternSpace;
                        ScPattern *pat = 
&m_Doc->docPatterns[ite->strokePattern()];
-                       uint patHash = qHash(ite->strokePattern());
+                       size_t patHash = qHash(ite->strokePattern());
                        ite->strokePatternTransform(patternScaleX, 
patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, 
patternSkewY, patternSpace);
                        patternMatrix.translate(patternOffsetX, 
-patternOffsetY);
                        patternMatrix.rotate(-patternRotation);

Modified: trunk/Scribus/scribus/sclayer.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24871&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp   (original)
+++ trunk/Scribus/scribus/sclayer.cpp   Mon Jan 31 00:45:08 2022
@@ -614,7 +614,7 @@
        return true;
 }
 
-uint qHash(const ScLayer& layer)
+size_t qHash(const ScLayer& layer)
 { 
        return qHash(&layer);
 }

Modified: trunk/Scribus/scribus/sclayer.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24871&path=/trunk/Scribus/scribus/sclayer.h
==============================================================================
--- trunk/Scribus/scribus/sclayer.h     (original)
+++ trunk/Scribus/scribus/sclayer.h     Mon Jan 31 00:45:08 2022
@@ -340,6 +340,6 @@
         bool setLayerSelectable(int layerID, bool isSelectable);
 };
 
-uint qHash(const ScLayer& layer);
+size_t qHash(const ScLayer& layer);
 
 #endif

Modified: trunk/Scribus/scribus/tablecell.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24871&path=/trunk/Scribus/scribus/tablecell.h
==============================================================================
--- trunk/Scribus/scribus/tablecell.h   (original)
+++ trunk/Scribus/scribus/tablecell.h   Mon Jan 31 00:45:08 2022
@@ -254,7 +254,7 @@
 };
 Q_DECLARE_TYPEINFO(TableCell, Q_MOVABLE_TYPE);
 
-inline uint qHash(const TableCell& cell)
+inline size_t qHash(const TableCell& cell)
 {
        return (cell.row() << 16) ^ cell.column();
 }


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit