DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

rework overhauled serialization methods to non-static

Browse Source 
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.
This commit is contained in:
Kamil Domanski
2014-08-20 22:44:38 +02:00
parent 5d96b4ae01
commit 84881f8c47
13 changed files with 269 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/recentrequeststablemodel.h
View File

@@ -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);

10
src/qt/walletmodel.h
View File

@@ -59,14 +59,14 @@ public:
static const int CURRENT_VERSION = 1;
int nVersion;
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>();
SendCoinsRecipient* pthis = const_cast<SendCoinsRecipient*>(thisPtr);
SendCoinsRecipient* pthis = const_cast<SendCoinsRecipient*>(this);
std::string sAddress = pthis->address.toStdString();
std::string sLabel = pthis->label.toStdString();
@@ -80,7 +80,7 @@ public:
nVersion = pthis->nVersion;
READWRITE(sAddress);
READWRITE(sLabel);
READWRITE(thisPtr->amount);
READWRITE(amount);
READWRITE(sMessage);
READWRITE(sPaymentRequest);
READWRITE(sAuthenticatedMerchant);