diff options
| author | John Fultz <jfultz@wolfram.com> | 2023-07-19 18:08:38 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2023-07-19 22:38:25 -0500 |
| commit | eb8deb67284b5950a4748a091f52d1eb11284c39 (patch) | |
| tree | 98a3ae7b51e7bb35eef1bcde106673de19385916 | |
| parent | d302abb430f5cb75e7373197c91e269fdbaf2e61 (diff) | |
Fix various Qt6 deprecations.
| -rw-r--r-- | quacker/rackdisplay.cpp | 4 | ||||
| -rw-r--r-- | quackleio/dawgfactory.cpp | 2 | ||||
| -rw-r--r-- | quackleio/gaddagfactory.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/quacker/rackdisplay.cpp b/quacker/rackdisplay.cpp index b04c4fc..ef160a1 100644 --- a/quacker/rackdisplay.cpp +++ b/quacker/rackdisplay.cpp @@ -193,7 +193,11 @@ GraphicalRack::dropEvent (QDropEvent* event) droppedTile->setPixmap(pixmap); droppedTile->setAttribute (Qt::WA_DeleteOnClose); +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + QPoint dropPos = event->position().toPoint() - offset; +#else QPoint dropPos = event->pos() - offset; +#endif // Move the tile an extra half tile width in the direction of the // move. This allows the tile to assume a new spot if it is dragged diff --git a/quackleio/dawgfactory.cpp b/quackleio/dawgfactory.cpp index a320f5c..b5f4fc0 100644 --- a/quackleio/dawgfactory.cpp +++ b/quackleio/dawgfactory.cpp @@ -77,7 +77,7 @@ bool DawgFactory::pushWord(const Quackle::LetterString &word, bool inSmaller, in void DawgFactory::hashWord(const Quackle::LetterString &word) { QCryptographicHash wordhash(QCryptographicHash::Md5); - wordhash.addData(word.constData(), word.length()); + wordhash.addData(QByteArray::fromRawData(word.constData(), word.length())); QByteArray wordhashbytes = wordhash.result(); m_hash.int32ptr[0] ^= ((const int32_t*)wordhashbytes.constData())[0]; m_hash.int32ptr[1] ^= ((const int32_t*)wordhashbytes.constData())[1]; diff --git a/quackleio/gaddagfactory.cpp b/quackleio/gaddagfactory.cpp index 3fe129d..bb89de3 100644 --- a/quackleio/gaddagfactory.cpp +++ b/quackleio/gaddagfactory.cpp @@ -93,7 +93,7 @@ bool GaddagFactory::pushWord(const Quackle::LetterString &word) void GaddagFactory::hashWord(const Quackle::LetterString &word) { QCryptographicHash wordhash(QCryptographicHash::Md5); - wordhash.addData(word.constData(), word.length()); + wordhash.addData(QByteArray::fromRawData(word.constData(), word.length())); QByteArray wordhashbytes = wordhash.result(); m_hash.int32ptr[0] ^= ((const int32_t*)wordhashbytes.constData())[0]; m_hash.int32ptr[1] ^= ((const int32_t*)wordhashbytes.constData())[1]; |