Skip to content

Commit 4f7f887

Browse files
linuxdude42joki
authored andcommitted
Fix compiling Qt6 on 32-bit architectures.
1 parent 958895d commit 4f7f887

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

mythtv/libs/libmythbase/mythdate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ QString formatTime(std::chrono::milliseconds msecs, QString fmt)
282282
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
283283
int width = std::min(3, match.capturedLength());
284284
#else
285-
int width = std::min(3LL, match.capturedLength());
285+
int width = std::min(static_cast<qsizetype>(3), match.capturedLength());
286286
#endif
287287
int value = (msecs % 1s).count() / divisor[width];
288288
QString text = StringUtil::intToPaddedString(value, width);

mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ class HLSStream
895895
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
896896
int padding = std::max(0, AES_BLOCK_SIZE - (line.size() - 2));
897897
#else
898-
int padding = std::max(0LL, AES_BLOCK_SIZE - (line.size() - 2));
898+
int padding = std::max(static_cast<qsizetype>(0), AES_BLOCK_SIZE - (line.size() - 2));
899899
#endif
900900
QByteArray ba = QByteArray(padding, 0x0);
901901
ba.append(QByteArray::fromHex(QByteArray(line.toLatin1().constData() + 2)));

mythtv/libs/libmythtv/captions/cc608decoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ void CC608Decoder::BufferCC(size_t mode, int len, int clr)
678678
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
679679
len = std::min(tmpbuf.length(), 255);
680680
#else
681-
len = std::min(tmpbuf.length(), 255LL);
681+
len = std::min(tmpbuf.length(), static_cast<qsizetype>(255));
682682
#endif
683683
}
684684

mythtv/libs/libmythtv/eitfixup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ void EITFixUp::FixMCA(DBEventEIT &event)
15041504
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
15051505
uint evDescLen = std::max(event.m_description.length(), 1);
15061506
#else
1507-
uint evDescLen = std::max(event.m_description.length(), 1LL);
1507+
uint evDescLen = std::max(event.m_description.length(), static_cast<qsizetype>(1));
15081508
#endif
15091509

15101510
if ((matchLen < lSUBTITLE_MAX_LEN) &&
@@ -1722,7 +1722,7 @@ void EITFixUp::FixRTL(DBEventEIT &event)
17221722
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
17231723
uint evDescLen = std::max(event.m_description.length(), 1);
17241724
#else
1725-
uint evDescLen = std::max(event.m_description.length(), 1LL);
1725+
uint evDescLen = std::max(event.m_description.length(), static_cast<qsizetype>(1));
17261726
#endif
17271727

17281728
if ((matchLen < lSUBTITLE_MAX_LEN) &&

mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bool HLSRecSegment::SetAESIV(QString line)
8989
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
9090
int padding = std::max(0, AES_BLOCK_SIZE - (line.size() - 2));
9191
#else
92-
int padding = std::max(0LL, AES_BLOCK_SIZE - (line.size() - 2));
92+
int padding = std::max(static_cast<qsizetype>(0), AES_BLOCK_SIZE - (line.size() - 2));
9393
#endif
9494
QByteArray ba = QByteArray(padding, 0x0);
9595
ba.append(QByteArray::fromHex(QByteArray(line.toLatin1().constData() + 2)));

mythtv/libs/libmythui/mythuibuttonlist.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ bool MythUIButtonList::DistributeButtons(void)
860860
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
861861
start_button = std::max(m_buttonList.size() / 2, 0);
862862
#else
863-
start_button = std::max(m_buttonList.size() / 2, 0LL);
863+
start_button = std::max(m_buttonList.size() / 2, static_cast<qsizetype>(0));
864864
#endif
865865
start_button = (start_button / std::max(m_columns, 1)) * m_columns;
866866

0 commit comments

Comments
 (0)