From 41d165380dc2784c48f344132813f1c77f2243a8 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Sun, 20 Jul 2014 11:32:33 +0200 Subject: [PATCH 1/2] Qt: Fix monospace font in osx 10.9 The "Monospace" hint was added in Qt 4.8, and it works as intended as opposed to "TypeWriter" which fails to load a font. --- src/qt/guiutil.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 9f8dc0ab53..36247c541d 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -61,7 +61,11 @@ QString dateTimeStr(qint64 nTime) QFont bitcoinAddressFont() { QFont font("Monospace"); +#if QT_VERSION >= 0x040800 + font.setStyleHint(QFont::Monospace); +#else font.setStyleHint(QFont::TypeWriter); +#endif return font; } From 911b66b251e250e4fe5a76579aae84df7002eae3 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Sun, 20 Jul 2014 11:51:46 +0200 Subject: [PATCH 2/2] this fixes compilation error on win32 --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 00c2287674..ea58db2f90 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5833,7 +5833,7 @@ int CDarkSendPool::GetCurrentMasterNode(int mod, int64 nBlockHeight) int CDarkSendPool::GetMasternodeRank(CTxIn& vin, int mod) { - std::vector > vecMasternodeScores; + std::vector > vecMasternodeScores; BOOST_FOREACH(CMasterNode mn, darkSendMasterNodes) { mn.Check(); @@ -5851,7 +5851,7 @@ int CDarkSendPool::GetMasternodeRank(CTxIn& vin, int mod) sort(vecMasternodeScores.rbegin(), vecMasternodeScores.rend(), CompareValueOnly()); unsigned int rank = 0; - BOOST_FOREACH (PAIRTYPE(uint, CTxIn)& s, vecMasternodeScores){ + BOOST_FOREACH (PAIRTYPE(unsigned int, CTxIn)& s, vecMasternodeScores){ rank++; if(s.second == vin) return rank; }