sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-29 13:59:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master-rc4' of https://github.com/darkcoinproject/darkcoin into master-rc4

Browse Source
This commit is contained in:
Evan Duffield 2014-07-20 10:13:59 -07:00
commit e26d300a13
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -5833,7 +5833,7 @@ int CDarkSendPool::GetCurrentMasterNode(int mod, int64 nBlockHeight)
int CDarkSendPool::GetMasternodeRank(CTxIn& vin, int mod) int CDarkSendPool::GetMasternodeRank(CTxIn& vin, int mod)
{ {
std::vector<pair<uint, CTxIn> > vecMasternodeScores; std::vector<pair<unsigned int, CTxIn> > vecMasternodeScores;
BOOST_FOREACH(CMasterNode mn, darkSendMasterNodes) { BOOST_FOREACH(CMasterNode mn, darkSendMasterNodes) {
mn.Check(); mn.Check();
@ -5851,7 +5851,7 @@ int CDarkSendPool::GetMasternodeRank(CTxIn& vin, int mod)
sort(vecMasternodeScores.rbegin(), vecMasternodeScores.rend(), CompareValueOnly()); sort(vecMasternodeScores.rbegin(), vecMasternodeScores.rend(), CompareValueOnly());
unsigned int rank = 0; unsigned int rank = 0;
BOOST_FOREACH (PAIRTYPE(uint, CTxIn)& s, vecMasternodeScores){ BOOST_FOREACH (PAIRTYPE(unsigned int, CTxIn)& s, vecMasternodeScores){
rank++; rank++;
if(s.second == vin) return rank; if(s.second == vin) return rank;
} }

4
src/qt/guiutil.cpp
View File

@ -61,7 +61,11 @@ QString dateTimeStr(qint64 nTime)
QFont bitcoinAddressFont() QFont bitcoinAddressFont()
{ {
QFont font("Monospace"); QFont font("Monospace");
#if QT_VERSION >= 0x040800
font.setStyleHint(QFont::Monospace);
#else
font.setStyleHint(QFont::TypeWriter); font.setStyleHint(QFont::TypeWriter);
#endif
return font; return font;
} }