diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:00:32 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:23:01 +0200 |
| commit | 2e731f24b5a5c894e013a6d752f1cd409303e916 (patch) | |
| tree | 94ba6f1e3ab9ecb5ac1696b48b1aabc859aa8365 /src/qt | |
| parent | f6a81050372810d8eebc15523bde28e91d045314 (diff) | |
| parent | 31e9a8384a77947f6777d035992f4734618ed206 (diff) | |
| download | bitcoin-2e731f24b5a5c894e013a6d752f1cd409303e916.tar.xz | |
Merge pull request #4737
31e9a83 Use CSizeComputer to avoid counting sizes in SerializationOp (Pieter Wuille)
84881f8 rework overhauled serialization methods to non-static (Kamil Domanski)
5d96b4a remove fields of ser_streamplaceholder (Kamil Domanski)
3d796f8 overhaul serialization code (Kamil Domanski)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/recentrequeststablemodel.h | 12 | ||||
| -rw-r--r-- | src/qt/walletmodel.h | 10 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index 4f0b241259..a558aa4942 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -24,8 +24,12 @@ public: QDateTime date; SendCoinsRecipient recipient; - IMPLEMENT_SERIALIZE - ( + IMPLEMENT_SERIALIZE; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { + bool fRead = ser_action.ForRead(); + RecentRequestEntry* pthis = const_cast<RecentRequestEntry*>(this); unsigned int nDate = date.toTime_t(); @@ -37,8 +41,8 @@ public: READWRITE(recipient); if (fRead) - pthis->date = QDateTime::fromTime_t(nDate); - ) + date = QDateTime::fromTime_t(nDate); + } }; class RecentRequestEntryLessThan diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index b3a401e4cc..2a9ac4650f 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -59,8 +59,12 @@ public: static const int CURRENT_VERSION = 1; int nVersion; - IMPLEMENT_SERIALIZE - ( + IMPLEMENT_SERIALIZE; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { + bool fRead = ser_action.ForRead(); + SendCoinsRecipient* pthis = const_cast<SendCoinsRecipient*>(this); std::string sAddress = pthis->address.toStdString(); @@ -89,7 +93,7 @@ public: pthis->paymentRequest.parse(QByteArray::fromRawData(sPaymentRequest.data(), sPaymentRequest.size())); pthis->authenticatedMerchant = QString::fromStdString(sAuthenticatedMerchant); } - ) + } }; /** Interface to Bitcoin wallet from Qt view code. */ |