From b1189cfa105da414d8645f7284c16a443a710cfe Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 3 Jul 2015 08:35:14 +0200 Subject: [Qt] adapt QT ban option to banlist.dat changes --- src/qt/bantablemodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/qt/bantablemodel.cpp') diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index 04840b052..42542371e 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -27,7 +27,7 @@ bool BannedNodeLessThan::operator()(const CCombinedBan& left, const CCombinedBan case BanTableModel::Address: return pLeft->subnet.ToString().compare(pRight->subnet.ToString()) < 0; case BanTableModel::Bantime: - return pLeft->bantil < pRight->bantil; + return pLeft->banEntry.nBanUntil < pRight->banEntry.nBanUntil; } return false; @@ -47,18 +47,18 @@ public: /** Pull a full list of banned nodes from CNode into our cache */ void refreshBanlist() { - std::map banMap; + banmap_t banMap; CNode::GetBanned(banMap); cachedBanlist.clear(); #if QT_VERSION >= 0x040700 cachedBanlist.reserve(banMap.size()); #endif - foreach (const PAIRTYPE(CSubNet, int64_t)& banentry, banMap) + foreach (const PAIRTYPE(CSubNet, CBanEntry)& banentry, banMap) { CCombinedBan banEntry; banEntry.subnet = banentry.first; - banEntry.bantil = banentry.second; + banEntry.banEntry = banentry.second; cachedBanlist.append(banEntry); } @@ -120,7 +120,7 @@ QVariant BanTableModel::data(const QModelIndex &index, int role) const return QString::fromStdString(rec->subnet.ToString()); case Bantime: QDateTime date = QDateTime::fromMSecsSinceEpoch(0); - date = date.addSecs(rec->bantil); + date = date.addSecs(rec->banEntry.nBanUntil); return date.toString(Qt::SystemLocaleLongDate); } } -- cgit v1.2.3