From 27a7aa22796a5132f643a0100cad1f93ce9cc4db Mon Sep 17 00:00:00 2001 From: svost Date: Mon, 17 Oct 2016 12:51:43 +0300 Subject: [PATCH] Remove useless inline --- src/main.cpp | 2 +- src/miner.cpp | 6 +++--- src/ntp.cpp | 2 +- src/util.cpp | 2 +- src/wallet.cpp | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index aa50e82..dbbafe9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3097,7 +3097,7 @@ bool CheckDiskSpace(uint64_t nAdditionalBytes) if (nFreeBytesAvailable < nMinDiskSpace + nAdditionalBytes) { fShutdown = true; - string strMessage = _("Warning: Disk space is low!"); + string strMessage("Warning: Disk space is low!"); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); uiInterface.ThreadSafeMessageBox(strMessage, "NovaCoin", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL); diff --git a/src/miner.cpp b/src/miner.cpp index 55e4fec..4c8c305 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -717,7 +717,7 @@ void ThreadStakeMiner(void* parg) // Create new coinstake transaction if (!pwallet->CreateCoinStake(LuckyInput.first, LuckyInput.second, solution.second, nBits, txCoinStake, key)) { - string strMessage = _("Warning: Unable to create coinstake transaction, see debug.log for the details. Mining thread has been stopped."); + string strMessage("Warning: Unable to create coinstake transaction, see debug.log for the details. Mining thread has been stopped."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); @@ -728,7 +728,7 @@ void ThreadStakeMiner(void* parg) auto pblock = CreateNewBlock(pwallet, &txCoinStake); if (!pblock) { - string strMessage = _("Warning: Unable to allocate memory for the new block object. Mining thread has been stopped."); + string strMessage("Warning: Unable to allocate memory for the new block object. Mining thread has been stopped."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); @@ -741,7 +741,7 @@ void ThreadStakeMiner(void* parg) // ... and sign it if (!key.Sign(pblock->GetHash(), pblock->vchBlockSig)) { - string strMessage = _("Warning: Proof-of-Stake miner is unable to sign the block (locked wallet?). Mining thread has been stopped."); + string strMessage("Warning: Proof-of-Stake miner is unable to sign the block (locked wallet?). Mining thread has been stopped."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); diff --git a/src/ntp.cpp b/src/ntp.cpp index 26450a1..59dbc02 100644 --- a/src/ntp.cpp +++ b/src/ntp.cpp @@ -493,7 +493,7 @@ void ThreadNtpSamples(void* parg) { if (GetNodesOffset() == numeric_limits::max() && abs(nNtpOffset) > 40 * 60) { // If there is not enough node offsets data and NTP time offset is greater than 40 minutes then give a warning. - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong NovaCoin will not work properly."); + string strMessage("Warning: Please check that your computer's date and time are correct! If your clock is wrong NovaCoin will not work properly."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); uiInterface.ThreadSafeMessageBox(strMessage+" ", string("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION); diff --git a/src/util.cpp b/src/util.cpp index 6a44ec8..aac1678 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1346,7 +1346,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime) if (!fMatch) { fDone = true; - string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong NovaCoin will not work properly."); + string strMessage("Warning: Please check that your computer's date and time are correct! If your clock is wrong NovaCoin will not work properly."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); uiInterface.ThreadSafeMessageBox(strMessage+" ", string("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION); diff --git a/src/wallet.cpp b/src/wallet.cpp index d63db2a..9baa959 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -2600,22 +2600,22 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe { // Check amount if (nValue <= 0) - return _("Invalid amount"); + return "Invalid amount"; if (nValue + nTransactionFee > GetBalance()) - return _("Insufficient funds"); + return "Insufficient funds"; CReserveKey reservekey(this); int64_t nFeeRequired; if (IsLocked()) { - string strError = _("Error: Wallet locked, unable to create transaction "); + string strError("Error: Wallet locked, unable to create transaction "); printf("SendMoney() : %s", strError.c_str()); return strError; } if (fWalletUnlockMintOnly) { - string strError = _("Error: Wallet unlocked for block minting only, unable to create transaction."); + string strError("Error: Wallet unlocked for block minting only, unable to create transaction."); printf("SendMoney() : %s", strError.c_str()); return strError; } @@ -2634,7 +2634,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe return "ABORTED"; if (!CommitTransaction(wtxNew, reservekey)) - return _("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); + return "Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."; return ""; } -- 1.7.1