From c9250bdb4b13318b5bd9ae63a0d09f9ec18df7a9 Mon Sep 17 00:00:00 2001 From: APTX Date: Mon, 21 May 2012 21:11:04 +0200 Subject: [PATCH] Update FileReply to use new LastFlag flags. --- filecommand.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/filecommand.cpp b/filecommand.cpp index 18266e6..1865f76 100644 --- a/filecommand.cpp +++ b/filecommand.cpp @@ -249,7 +249,7 @@ void FileCommand::init() m_epno = 0; m_fmask = FileFlags(0); - m_amask = AnimeFlags(0); + m_amask = FileAnimeFlags(0); } // === @@ -309,24 +309,21 @@ void FileReply::readReplyData(const QString &reply) } int partNo = 1; + for (FileFlags::flag_type flag = FileFlag::LastFlag; flag > 0; flag >>= 1) { - FileFlags::flag_type flag = Q_UINT64_C(1) << 63; - for (int i = 0; i < 64; ++i, flag = flag >> 1) + if (command().fmask() & flag) { - if (command().fmask() & flag) + if (partNo >= parts.size()) { - if (partNo >= parts.size()) - { - qWarning() << "Not enough parts in reply."; - continue; - } - fileFlagData.insert(FileFlags(flag), parts[partNo]); - ++partNo; + qWarning() << "Not enough parts in reply."; + continue; } + fileFlagData.insert(FileFlags(flag), parts[partNo]); + ++partNo; } } - for (int i = 0, flag = 1 << 31; i < 32; ++i, flag = (flag >> 1) & ~(1 << 31)) + for (FileAnimeFlags::flag_type flag = FileAnimeFlag::LastFlag; flag > 0; flag >>= 1) { if (command().amask() & flag) { -- 2.52.0