Skip to content

Commit

Permalink
fix tabs/spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
UdjinM6 committed May 29, 2016
1 parent 474c0b5 commit 24c4ecd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1450,17 +1450,17 @@ int64_t GetTotalCoinEstimate(int nHeight)
/* these values are taken from the block explorer */
if(nHeight > 5076) nTotalCoins += 2021642;
if(nHeight > 17000) nTotalCoins += 3267692-2021642;
if(nHeight > 34000) nTotalCoins += 3688775-3267692;
if(nHeight > 68000) nTotalCoins += 4277615-3688775;
if(nHeight > 34000) nTotalCoins += 3688775-3267692;
if(nHeight > 68000) nTotalCoins += 4277615-3688775;

if(nHeight > 68000*2) {
nTotalCoins += 4649913.99999995-4277615;
nTotalCoins += 4649913.99999995-4277615;
} else {
return nTotalCoins;
}

//5.383754730451325 per block average after this
nTotalCoins += ((nHeight-68000*2)*((5382104.64334133-4649913.99999995)/(68000*2)));
nTotalCoins += ((nHeight-68000*2)*((5382104.64334133-4649913.99999995)/(68000*2)));

// TODO: this should include the 7.1% decline too
return nTotalCoins;
Expand Down Expand Up @@ -4565,7 +4565,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
}
}

if (!pushed && inv.type == MSG_DSTX) {
if (!pushed && inv.type == MSG_DSTX) {
if(mapDarksendBroadcastTxes.count(inv.hash)){
CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
ss.reserve(1000);
Expand Down
2 changes: 1 addition & 1 deletion src/masternode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb)
//
bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb)
{
if(mnb.sigTime > sigTime) {
if(mnb.sigTime > sigTime) {
pubkey2 = mnb.pubkey2;
sigTime = mnb.sigTime;
vchSig = mnb.vchSig;
Expand Down
4 changes: 2 additions & 2 deletions src/qt/rpcconsole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ void RPCConsole::setClientModel(ClientModel *model)
autoCompleter = new QCompleter(wordList, this);
ui->lineEdit->setCompleter(autoCompleter);

// clear the lineEdit after activating from QCompleter
connect(autoCompleter, SIGNAL(activated(const QString&)), ui->lineEdit, SLOT(clear()), Qt::QueuedConnection);
// clear the lineEdit after activating from QCompleter
connect(autoCompleter, SIGNAL(activated(const QString&)), ui->lineEdit, SLOT(clear()), Qt::QueuedConnection);
}
}

Expand Down

0 comments on commit 24c4ecd

Please sign in to comment.