aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/addrman.h2
-rw-r--r--src/base58.h2
-rw-r--r--src/bitcoinrpc.cpp12
-rw-r--r--src/crypter.cpp4
-rw-r--r--src/init.cpp6
-rw-r--r--src/irc.cpp2
-rw-r--r--src/key.cpp2
-rw-r--r--src/main.cpp30
-rw-r--r--src/net.cpp14
-rw-r--r--src/net.h4
-rw-r--r--src/netbase.cpp8
-rw-r--r--src/netbase.h4
-rw-r--r--src/qt/askpassphrasedialog.cpp2
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/bitcoinaddressvalidator.cpp4
-rw-r--r--src/qt/bitcoinamountfield.h2
-rw-r--r--src/qt/bitcoingui.cpp4
-rw-r--r--src/qt/bitcoingui.h4
-rw-r--r--src/qt/bitcoinunits.h6
-rw-r--r--src/qt/guiutil.cpp4
-rw-r--r--src/qt/guiutil.h2
-rw-r--r--src/qt/notificator.cpp4
-rw-r--r--src/qt/notificator.h2
-rw-r--r--src/qt/signverifymessagedialog.cpp2
-rw-r--r--src/qt/transactionfilterproxy.h2
-rw-r--r--src/qt/transactionview.cpp2
-rw-r--r--src/script.cpp8
-rw-r--r--src/test/DoS_tests.cpp2
-rw-r--r--src/test/script_P2SH_tests.cpp4
-rw-r--r--src/util.h2
-rw-r--r--src/wallet.cpp4
31 files changed, 76 insertions, 76 deletions
diff --git a/src/addrman.h b/src/addrman.h
index 0392654366..30b8ef1a30 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -117,7 +117,7 @@ public:
// * Bucket selection is based on cryptographic hashing, using a randomly-generated 256-bit key, which should not
// be observable by adversaries.
// * Several indexes are kept for high performance. Defining DEBUG_ADDRMAN will introduce frequent (and expensive)
-// consistency checks for the entire datastructure.
+// consistency checks for the entire data structure.
// total number of buckets for tried addresses
#define ADDRMAN_TRIED_BUCKET_COUNT 64
diff --git a/src/base58.h b/src/base58.h
index 215fd33324..fc8c8aa5de 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -10,7 +10,7 @@
// could be used to create visually identical looking account numbers.
// - A string with non-alphanumeric characters is not as easily accepted as an account number.
// - E-mail usually won't line-break if there's no punctuation to break at.
-// - Doubleclicking selects the whole number as one word if it's all alphanumeric.
+// - Double-clicking selects the whole number as one word if it's all alphanumeric.
//
#ifndef BITCOIN_BASE58_H
#define BITCOIN_BASE58_H
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 3af298a58b..675c8462ea 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1881,7 +1881,7 @@ Value getwork(const Array& params, bool fHelp)
// Save
mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
- // Prebuild hash buffers
+ // Pre-build hash buffers
char pmidstate[32];
char pdata[128];
char phash1[64];
@@ -2194,7 +2194,7 @@ string rfc1123Time()
time(&now);
struct tm* now_gmt = gmtime(&now);
string locale(setlocale(LC_TIME, NULL));
- setlocale(LC_TIME, "C"); // we want posix (aka "C") weekday/month strings
+ setlocale(LC_TIME, "C"); // we want POSIX (aka "C") weekday/month strings
strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S +0000", now_gmt);
setlocale(LC_TIME, locale.c_str());
return string(buffer);
@@ -2388,7 +2388,7 @@ bool ClientAllowed(const boost::asio::ip::address& address)
if (address == asio::ip::address_v4::loopback()
|| address == asio::ip::address_v6::loopback()
|| (address.is_v4()
- // Chech whether IPv4 addresses match 127.0.0.0/8 (loopback subnet)
+ // Check whether IPv4 addresses match 127.0.0.0/8 (loopback subnet)
&& (address.to_v4().to_ulong() & 0xff000000) == 0x7f000000))
return true;
@@ -2565,7 +2565,7 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
{
vnThreadsRunning[THREAD_RPCLISTENER]++;
- // Immediately start accepting new connections, except when we're canceled or our socket is closed.
+ // Immediately start accepting new connections, except when we're cancelled or our socket is closed.
if (error != asio::error::operation_aborted
&& acceptor->is_open())
RPCListen(acceptor, context, fUseSSL);
@@ -2698,7 +2698,7 @@ void ThreadRPCServer2(void* parg)
}
catch(boost::system::system_error &e)
{
- uiInterface.ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
+ uiInterface.ThreadSafeMessageBox(strprintf(_("An error occurred while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
_("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL);
StartShutdown();
return;
@@ -3105,7 +3105,7 @@ int CommandLineRPC(int argc, char *argv[])
int main(int argc, char *argv[])
{
#ifdef _MSC_VER
- // Turn off microsoft heap dump noise
+ // Turn off Microsoft heap dump noise
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_WARN, CreateFile("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0));
#endif
diff --git a/src/crypter.cpp b/src/crypter.cpp
index 4f37575a6a..411a1ee4c1 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -17,7 +17,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v
if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
return false;
- // Try to keep the keydata out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
+ // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap)
// Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
// Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
mlock(&chKey[0], sizeof chKey);
@@ -44,7 +44,7 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne
if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE)
return false;
- // Try to keep the keydata out of swap
+ // Try to keep the key data out of swap
// Note that this does nothing about suspend-to-disk (which will put all our key data on disk)
// Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process.
mlock(&chKey[0], sizeof chKey);
diff --git a/src/init.cpp b/src/init.cpp
index 5fbe9d5d64..1599efa0f0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -82,7 +82,7 @@ void Shutdown(void* parg)
printf("Bitcoin exited\n\n");
fExit = true;
#ifndef QT_GUI
- // ensure non UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp
+ // ensure non-UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp
exit(0);
#endif
}
@@ -302,12 +302,12 @@ bool AppInit2()
{
// ********************************************************* Step 1: setup
#ifdef _MSC_VER
- // Turn off microsoft heap dump noise
+ // Turn off Microsoft heap dump noise
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_WARN, CreateFileA("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0));
#endif
#if _MSC_VER >= 1400
- // Disable confusing "helpful" text message on abort, ctrl-c
+ // Disable confusing "helpful" text message on abort, Ctrl-C
_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
#endif
#ifndef WIN32
diff --git a/src/irc.cpp b/src/irc.cpp
index a790d3f4f9..50c6a5b4db 100644
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -207,7 +207,7 @@ void ThreadIRCSeed(void* parg)
void ThreadIRCSeed2(void* parg)
{
- /* Dont advertise on IRC if we don't allow incoming connections */
+ /* Don't advertise on IRC if we don't allow incoming connections */
if (mapArgs.count("-connect") || fNoListen)
return;
diff --git a/src/key.cpp b/src/key.cpp
index c943a38ea6..76c45d0635 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -48,7 +48,7 @@ err:
// Perform ECDSA key recovery (see SEC1 4.1.6) for curves over (mod p)-fields
// recid selects which key is recovered
-// if check is nonzero, additional checks are performed
+// if check is non-zero, additional checks are performed
int ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check)
{
if (!eckey) return 0;
diff --git a/src/main.cpp b/src/main.cpp
index 0c636cdec1..9e61a04701 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1039,7 +1039,7 @@ bool CTransaction::DisconnectInputs(CTxDB& txdb)
// Remove transaction from index
// This can fail if a duplicate of this transaction was in a chain that got
// reorganized away. This is only possible if this transaction was completely
- // spent, so erasing it would be a no-op anway.
+ // spent, so erasing it would be a no-op anyway.
txdb.EraseTxIndex(*this);
return true;
@@ -1604,7 +1604,7 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)
return error("SetBestChain() : Reorganize failed");
}
- // Connect futher blocks
+ // Connect further blocks
BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vpindexSecondary)
{
CBlock block;
@@ -1769,7 +1769,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
if (nSigOps > MAX_BLOCK_SIGOPS)
return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"));
- // Check merkleroot
+ // Check merkle root
if (fCheckMerkleRoot && hashMerkleRoot != BuildMerkleTree())
return DoS(100, error("CheckBlock() : hashMerkleRoot mismatch"));
@@ -1805,7 +1805,7 @@ bool CBlock::AcceptBlock()
// Check that the block chain matches the known block chain up to a checkpoint
if (!Checkpoints::CheckBlock(nHeight, hash))
- return DoS(100, error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight));
+ return DoS(100, error("AcceptBlock() : rejected by checkpoint lock-in at %d", nHeight));
// Write block to history file
if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION)))
@@ -1963,7 +1963,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet)
return NULL;
if (fseek(file, 0, SEEK_END) != 0)
return NULL;
- // FAT32 filesize max 4GB, fseek and ftell max 2GB, so we must stay under 2GB
+ // FAT32 file size max 4GB, fseek and ftell max 2GB, so we must stay under 2GB
if (ftell(file) < 0x7F000000 - MAX_SIZE)
{
nFileRet = nCurrentBlockFile;
@@ -2055,7 +2055,7 @@ bool LoadBlockIndex(bool fAllowNew)
void PrintBlockTree()
{
- // precompute tree structure
+ // pre-compute tree structure
map<CBlockIndex*, vector<CBlockIndex*> > mapNext;
for (map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi)
{
@@ -2108,7 +2108,7 @@ void PrintBlockTree()
PrintWallets(block);
- // put the main timechain first
+ // put the main time-chain first
vector<CBlockIndex*>& vNext = mapNext[pindex];
for (unsigned int i = 0; i < vNext.size(); i++)
{
@@ -2347,7 +2347,7 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
// The message start string is designed to be unlikely to occur in normal data.
-// The characters are rarely used upper ascii, not valid as UTF-8, and produce
+// The characters are rarely used upper ASCII, not valid as UTF-8, and produce
// a large 4-byte int at any alignment.
unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
@@ -3030,12 +3030,12 @@ bool ProcessMessages(CNode* pfrom)
{
if (strstr(e.what(), "end of data"))
{
- // Allow exceptions from underlength message on vRecv
+ // Allow exceptions from under-length message on vRecv
printf("ProcessMessages(%s, %u bytes) : Exception '%s' caught, normally caused by a message being shorter than its stated length\n", strCommand.c_str(), nMessageSize, e.what());
}
else if (strstr(e.what(), "size too large"))
{
- // Allow exceptions from overlong size
+ // Allow exceptions from over-long size
printf("ProcessMessages(%s, %u bytes) : Exception '%s' caught\n", strCommand.c_str(), nMessageSize, e.what());
}
else
@@ -3284,9 +3284,9 @@ unsigned int static ScanHash_CryptoPP(char* pmidstate, char* pdata, char* phash1
unsigned int& nNonce = *(unsigned int*)(pdata + 12);
for (;;)
{
- // Crypto++ SHA-256
+ // Crypto++ SHA256
// Hash pdata using pmidstate as the starting state into
- // preformatted buffer phash1, then hash phash1 into phash
+ // pre-formatted buffer phash1, then hash phash1 into phash
nNonce++;
SHA256Transform(phash1, pdata, pmidstate);
SHA256Transform(phash, phash1, pSHA256InitState);
@@ -3623,7 +3623,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int&
void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1)
{
//
- // Prebuild hash buffers
+ // Pre-build hash buffers
//
struct
{
@@ -3751,7 +3751,7 @@ void static BitcoinMiner(CWallet *pwallet)
//
- // Prebuild hash buffers
+ // Pre-build hash buffers
//
char pmidstatebuf[32+16]; char* pmidstate = alignup<16>(pmidstatebuf);
char pdatabuf[128+16]; char* pdata = alignup<16>(pdatabuf);
@@ -3776,7 +3776,7 @@ void static BitcoinMiner(CWallet *pwallet)
unsigned int nHashesDone = 0;
unsigned int nNonceFound;
- // Crypto++ SHA-256
+ // Crypto++ SHA256
nNonceFound = ScanHash_CryptoPP(pmidstate, pdata + 64, phash1,
(char*)&hash, nHashesDone);
diff --git a/src/net.cpp b/src/net.cpp
index cc1aeeff08..b3474e7276 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -357,7 +357,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
{
// We should be phasing out our use of sites like these. If we need
// replacements, we should ask for volunteers to put this simple
- // php file on their webserver that prints the client IP:
+ // php file on their web server that prints the client IP:
// <?php echo $_SERVER["REMOTE_ADDR"]; ?>
if (nHost == 1)
{
@@ -497,14 +497,14 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, int64 nTimeout)
/// debug print
printf("connected %s\n", pszDest ? pszDest : addrConnect.ToString().c_str());
- // Set to nonblocking
+ // Set to non-blocking
#ifdef WIN32
u_long nOne = 1;
if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR)
- printf("ConnectSocket() : ioctlsocket nonblocking setting failed, error %d\n", WSAGetLastError());
+ printf("ConnectSocket() : ioctlsocket non-blocking setting failed, error %d\n", WSAGetLastError());
#else
if (fcntl(hSocket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR)
- printf("ConnectSocket() : fcntl nonblocking setting failed, error %d\n", errno);
+ printf("ConnectSocket() : fcntl non-blocking setting failed, error %d\n", errno);
#endif
// Add node
@@ -1596,7 +1596,7 @@ void ThreadOpenAddedConnections2(void* parg)
}
}
-// if succesful, this moves the passed grant to the constructed node
+// if successful, this moves the passed grant to the constructed node
bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound, const char *strDest, bool fOneShot)
{
//
@@ -1773,7 +1773,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
#ifdef WIN32
- // Set to nonblocking, incoming connections will also inherit this
+ // Set to non-blocking, incoming connections will also inherit this
if (ioctlsocket(hListenSocket, FIONBIO, (u_long*)&nOne) == SOCKET_ERROR)
#else
if (fcntl(hListenSocket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR)
@@ -1834,7 +1834,7 @@ void static Discover()
return;
#ifdef WIN32
- // Get local host ip
+ // Get local host IP
char pszHostName[1000] = "";
if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR)
{
diff --git a/src/net.h b/src/net.h
index fc120da806..3717c4e634 100644
--- a/src/net.h
+++ b/src/net.h
@@ -49,7 +49,7 @@ enum
LOCAL_BIND, // address explicit bound to
LOCAL_UPNP, // address reported by UPnP
LOCAL_IRC, // address reported by IRC (deprecated)
- LOCAL_HTTP, // address reported by whatismyip.com and similars
+ LOCAL_HTTP, // address reported by whatismyip.com and similar
LOCAL_MANUAL, // address explicitly specified (-externalip=)
LOCAL_MAX
@@ -181,7 +181,7 @@ protected:
int nRefCount;
// Denial-of-service detection/prevention
- // Key is ip address, value is banned-until-time
+ // Key is IP address, value is banned-until-time
static std::map<CNetAddr, int64> setBanned;
static CCriticalSection cs_setBanned;
int nMisbehavior;
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 0a54fdf46c..b66c366641 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -702,7 +702,7 @@ bool CNetAddr::IsMulticast() const
bool CNetAddr::IsValid() const
{
- // Clean up 3-byte shifted addresses caused by garbage in size field
+ // Cleanup 3-byte shifted addresses caused by garbage in size field
// of addr messages from versions before 0.2.9 checksum.
// Two consecutive addr messages look like this:
// header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...
@@ -851,13 +851,13 @@ std::vector<unsigned char> CNetAddr::GetGroup() const
nClass = NET_IPV4;
nStartByte = 12;
}
- // for 6to4 tunneled addresses, use the encapsulated IPv4 address
+ // for 6to4 tunnelled addresses, use the encapsulated IPv4 address
else if (IsRFC3964())
{
nClass = NET_IPV4;
nStartByte = 2;
}
- // for Teredo-tunneled IPv6 addresses, use the encapsulated IPv4 address
+ // for Teredo-tunnelled IPv6 addresses, use the encapsulated IPv4 address
else if (IsRFC4380())
{
vchRet.push_back(NET_IPV4);
@@ -954,7 +954,7 @@ int CNetAddr::GetReachabilityFrom(const CNetAddr *paddrPartner) const
default: return REACH_DEFAULT;
case NET_TEREDO: return REACH_TEREDO;
case NET_IPV4: return REACH_IPV4;
- case NET_IPV6: return fTunnel ? REACH_IPV6_WEAK : REACH_IPV6_STRONG; // only prefer giving our IPv6 address if it's not tunneled
+ case NET_IPV6: return fTunnel ? REACH_IPV6_WEAK : REACH_IPV6_STRONG; // only prefer giving our IPv6 address if it's not tunnelled
}
case NET_TOR:
switch(ourNet) {
diff --git a/src/netbase.h b/src/netbase.h
index f097d7f5ae..07ca12cb96 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -50,9 +50,9 @@ class CNetAddr
bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
bool IsRFC3927() const; // IPv4 autoconfig (169.254.0.0/16)
- bool IsRFC3964() const; // IPv6 6to4 tunneling (2002::/16)
+ bool IsRFC3964() const; // IPv6 6to4 tunnelling (2002::/16)
bool IsRFC4193() const; // IPv6 unique local (FC00::/15)
- bool IsRFC4380() const; // IPv6 Teredo tunneling (2001::/32)
+ bool IsRFC4380() const; // IPv6 Teredo tunnelling (2001::/32)
bool IsRFC4843() const; // IPv6 ORCHID (2001:10::/28)
bool IsRFC4862() const; // IPv6 autoconfig (FE80::/64)
bool IsRFC6052() const; // IPv6 well-known prefix (64:FF9B::/96)
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index 3656cbea1f..6b88a2f0c3 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -177,7 +177,7 @@ void AskPassphraseDialog::accept()
void AskPassphraseDialog::textChanged()
{
- // Validate input, set Ok button to enabled when accepable
+ // Validate input, set Ok button to enabled when acceptable
bool acceptable = false;
switch(mode)
{
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6bdac2ad70..7fcfd0dec7 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -272,7 +272,7 @@ int main(int argc, char *argv[])
// TODO: implement URI support on the Mac.
#if !defined(MAC_OSX)
- // Place this here as guiref has to be defined if we dont want to lose URIs
+ // Place this here as guiref has to be defined if we don't want to lose URIs
ipcInit();
// Check for URI in argv
diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
index d2b93e70f5..5136ea0c40 100644
--- a/src/qt/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
@@ -5,8 +5,8 @@
This is:
- All numbers except for '0'
- - All uppercase letters except for 'I' and 'O'
- - All lowercase letters except for 'l'
+ - All upper-case letters except for 'I' and 'O'
+ - All lower-case letters except for 'l'
User friendly Base58 input can map
- 'l' and 'I' to '1'
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index ead8bdb84b..ca4a888e4e 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -40,7 +40,7 @@ signals:
void textChanged();
protected:
- /** Intercept focus-in event and ',' keypresses */
+ /** Intercept focus-in event and ',' key presses */
bool eventFilter(QObject *object, QEvent *event);
private:
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index afb829e08a..b1a0d978c3 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -158,7 +158,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), this, SLOT(gotoHistoryPage()));
connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
- // Doubleclicking on a transaction on the transaction history page shows details
+ // Double-clicking on a transaction on the transaction history page shows details
connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
rpcConsole = new RPCConsole(this);
@@ -400,7 +400,7 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel)
setEncryptionStatus(walletModel->getEncryptionStatus());
connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int)));
- // Balloon popup for new transaction
+ // Balloon pop-up for new transaction
connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(incomingTransaction(QModelIndex,int,int)));
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index adc75b0481..acf84eb941 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -101,7 +101,7 @@ private:
/** Create the main UI actions. */
void createActions();
- /** Create the menu bar and submenus. */
+ /** Create the menu bar and sub-menus. */
void createMenuBar();
/** Create the toolbars */
void createToolBars();
@@ -168,7 +168,7 @@ private slots:
void backupWallet();
/** Change encrypted wallet passphrase */
void changePassphrase();
- /** Ask for pass phrase to unlock wallet temporarily */
+ /** Ask for passphrase to unlock wallet temporarily */
void unlockWallet();
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
index 18fa36a0b7..9b7c9e160e 100644
--- a/src/qt/bitcoinunits.h
+++ b/src/qt/bitcoinunits.h
@@ -5,7 +5,7 @@
#include <QAbstractListModel>
/** Bitcoin unit definitions. Encapsulates parsing and formatting
- and serves as list model for dropdown selection boxes.
+ and serves as list model for drop-down selection boxes.
*/
class BitcoinUnits: public QAbstractListModel
{
@@ -26,7 +26,7 @@ public:
//! Unit conversion and formatting
///@{
- //! Get list of units, for dropdown box
+ //! Get list of units, for drop-down box
static QList<Unit> availableUnits();
//! Is unit ID valid?
static bool valid(int unit);
@@ -49,7 +49,7 @@ public:
///@}
//! @name AbstractListModel implementation
- //! List model for unit dropdown selection box.
+ //! List model for unit drop-down selection box.
///@{
enum RoleIndex {
/** Unit identifier */
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index e6af9c3608..d3afc0a565 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -131,7 +131,7 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
// Convert bitcoin:// to bitcoin:
//
// Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,
- // which will lowercase it (and thus invalidate the address).
+ // which will lower-case it (and thus invalidate the address).
if(uri.startsWith("bitcoin://"))
{
uri.replace(0, 10, "bitcoin:");
@@ -436,7 +436,7 @@ HelpMessageBox::HelpMessageBox(QWidget *parent) :
setWindowTitle(tr("Bitcoin-Qt"));
setTextFormat(Qt::PlainText);
- // setMinimumWidth is ignored for QMessageBox so put in nonbreaking spaces to make it wider.
+ // setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider.
setText(header + QString(QChar(0x2003)).repeated(50));
setDetailedText(coreOptions + "\n" + uiOptions);
}
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index a6d11081d6..db100bdb73 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -47,7 +47,7 @@ namespace GUIUtil
*/
void copyEntryData(QAbstractItemView *view, int column, int role=Qt::EditRole);
- /** Get save file name, mimics QFileDialog::getSaveFileName, except that it appends a default suffix
+ /** Get save filename, mimics QFileDialog::getSaveFileName, except that it appends a default suffix
when no suffix is provided by the user.
@param[in] parent Parent window (or 0)
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index e668079536..c1c177dbfe 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -82,7 +82,7 @@ public:
static int metaType();
- // Image to variant that can be marshaled over DBus
+ // Image to variant that can be marshalled over DBus
static QVariant toVariant(const QImage &img);
private:
@@ -294,7 +294,7 @@ void Notificator::notify(Class cls, const QString &title, const QString &text, c
default:
if(cls == Critical)
{
- // Fall back to old fashioned popup dialog if critical and no other notification available
+ // Fall back to old fashioned pop-up dialog if critical and no other notification available
QMessageBox::critical(parent, title, text, QMessageBox::Ok, QMessageBox::Ok);
}
break;
diff --git a/src/qt/notificator.h b/src/qt/notificator.h
index 0271c26f48..8abc0b2ec2 100644
--- a/src/qt/notificator.h
+++ b/src/qt/notificator.h
@@ -27,7 +27,7 @@ public:
{
Information, /**< Informational message */
Warning, /**< Notify user of potential problem */
- Critical /**< An error occured */
+ Critical /**< An error occurred */
};
public slots:
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index f8edbf80ea..b3fc69ef0f 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -126,7 +126,7 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
if (!ctx.isValid())
{
ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
- ui->statusLabel_SM->setText(tr("Wallet unlock was canceled."));
+ ui->statusLabel_SM->setText(tr("Wallet unlock was cancelled."));
return;
}
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
index 8d6829d6f0..30b98588f0 100644
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -23,7 +23,7 @@ public:
void setDateRange(const QDateTime &from, const QDateTime &to);
void setAddressPrefix(const QString &addrPrefix);
/**
- @note Type filter takes a bitfield created with TYPE() or ALL_TYPES
+ @note Type filter takes a bit field created with TYPE() or ALL_TYPES
*/
void setTypeFilter(quint32 modes);
void setMinAmount(qint64 minimum);
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 1370a30ce4..ed2a70a350 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -205,7 +205,7 @@ void TransactionView::chooseDate(int idx)
TransactionFilterProxy::MAX_DATE);
break;
case ThisWeek: {
- // Find last monday
+ // Find last Monday
QDate startOfWeek = current.addDays(-(current.dayOfWeek()-1));
transactionProxyModel->setDateRange(
QDateTime(startOfWeek),
diff --git a/src/script.cpp b/src/script.cpp
index c29648c2bc..4b073bf941 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1070,7 +1070,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int
}
else if ((nHashType & 0x1f) == SIGHASH_SINGLE)
{
- // Only lockin the txout payee at same index as txin
+ // Only lock-in the txout payee at same index as txin
unsigned int nOut = nIn;
if (nOut >= txTmp.vout.size())
{
@@ -1272,7 +1272,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
if (!script2.GetOp(pc2, opcode2, vch2))
break;
// Normal situation is to fall through
- // to other if/else statments
+ // to other if/else statements
}
if (opcode2 == OP_PUBKEY)
@@ -1345,7 +1345,7 @@ bool SignN(const vector<valtype>& multisigdata, const CKeyStore& keystore, uint2
// Sign scriptPubKey with private keys stored in keystore, given transaction hash and hash type.
// Signatures are returned in scriptSigRet (or returns false if scriptPubKey can't be signed),
// unless whichTypeRet is TX_SCRIPTHASH, in which case scriptSigRet is the redemption script.
-// Returns false if scriptPubKey could not be completely satisified.
+// Returns false if scriptPubKey could not be completely satisfied.
//
bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash, int nHashType,
CScript& scriptSigRet, txnouttype& whichTypeRet)
@@ -1733,7 +1733,7 @@ static CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo,
return PushAll(sigs1);
else
{
- // Recurse to combine:
+ // Recur to combine:
valtype spk = sigs1.back();
CScript pubKey2(spk.begin(), spk.end());
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 4a185b3cc5..7f08dd5543 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
dummyNode1.Misbehaving(100); // Should get banned
BOOST_CHECK(CNode::IsBanned(addr1));
- BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different ip, not banned
+ BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
CAddress addr2(ip(0xa0b0c002));
CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index f7bf5dfbf1..eabfcd0304 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(norecurse)
// Should not verify, because it will try to execute OP_INVALIDOPCODE
BOOST_CHECK(!Verify(scriptSig, p2sh, true));
- // Try to recurse, and verification should succeed because
+ // Try to recur, and verification should succeed because
// the inner HASH160 <> EQUAL should only check the hash:
CScript p2sh2;
p2sh2.SetDestination(p2sh.GetID());
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(is)
BOOST_AUTO_TEST_CASE(switchover)
{
- // Test switchover code
+ // Test switch over code
CScript notValid;
notValid << OP_11 << OP_12 << OP_EQUALVERIFY;
CScript scriptSig;
diff --git a/src/util.h b/src/util.h
index 4423d2ff58..8244dcbaf1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -12,7 +12,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#else
-typedef int pid_t; /* define for windows compatiblity */
+typedef int pid_t; /* define for windows compatibility */
#endif
#include <map>
#include <vector>
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 4d99ce6560..dcc170a360 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -758,7 +758,7 @@ void CWallet::ReacceptWalletTransactions()
}
else
{
- // Reaccept any txes of ours that aren't already in a block
+ // Re-accept any txes of ours that aren't already in a block
if (!wtx.IsCoinBase())
wtx.AcceptWalletTransaction(txdb, false);
}
@@ -767,7 +767,7 @@ void CWallet::ReacceptWalletTransactions()
{
// TODO: optimize this to scan just part of the block chain?
if (ScanForWalletTransactions(pindexGenesisBlock))
- fRepeat = true; // Found missing transactions: re-do Reaccept.
+ fRepeat = true; // Found missing transactions: re-do re-accept.
}
}
}
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-05 11:50:50 +0000