aboutsummaryrefslogtreecommitdiff
path: root/src/qt/recentrequeststablemodel.h
diff options
context:
space:
mode:
authorKamil Domanski <kdomanski@kdemail.net>2014-08-20 22:44:38 +0200
committerKamil Domanski <kdomanski@kdemail.net>2014-08-31 02:16:17 +0200
commit84881f8c472cc67dc757686eb7dc3b495b13cab8 (patch)
tree9aa2ae012cc4817464cb60e9d838fa92464a9477 /src/qt/recentrequeststablemodel.h
parent5d96b4ae0188fcad36105642c5d69249d37fdbb5 (diff)
downloadbitcoin-84881f8c472cc67dc757686eb7dc3b495b13cab8.tar.xz
rework overhauled serialization methods to non-static
Thanks to Pieter Wuille for most of the work on this commit. I did not fixup the overhaul commit, because a rebase conflicted with "remove fields of ser_streamplaceholder". I prefer not to risk making a mistake while resolving it.
Diffstat (limited to 'src/qt/recentrequeststablemodel.h')
-rw-r--r--src/qt/recentrequeststablemodel.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 50962334f5..581d7b2c5e 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -24,22 +24,22 @@ public:
QDateTime date;
SendCoinsRecipient recipient;
- IMPLEMENT_SERIALIZE
+ IMPLEMENT_SERIALIZE;
- template <typename T, typename Stream, typename Operation>
- inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) {
+ template <typename Stream, typename Operation>
+ inline size_t SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
size_t nSerSize = 0;
bool fRead = boost::is_same<Operation, CSerActionUnserialize>();
- RecentRequestEntry* pthis = const_cast<RecentRequestEntry*>(thisPtr);
+ RecentRequestEntry* pthis = const_cast<RecentRequestEntry*>(this);
- unsigned int nDate = thisPtr->date.toTime_t();
+ unsigned int nDate = date.toTime_t();
READWRITE(pthis->nVersion);
nVersion = pthis->nVersion;
- READWRITE(thisPtr->id);
+ READWRITE(id);
READWRITE(nDate);
- READWRITE(thisPtr->recipient);
+ READWRITE(recipient);
if (fRead)
pthis->date = QDateTime::fromTime_t(nDate);