Browse Source

small indentation, space, formatting fixes (no code changes)

0.8
Philip Kaufmann 12 years ago
parent
commit
b001c87126
  1. 3
      src/init.cpp
  2. 4
      src/net.cpp
  3. 1
      src/qt/bitcoingui.h
  4. 1
      src/qt/paymentserver.h

3
src/init.cpp

@ -376,7 +376,6 @@ struct CImportingNow @@ -376,7 +376,6 @@ struct CImportingNow
}
};
void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
{
RenameThread("bitcoin-loadblk");
@ -633,7 +632,6 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -633,7 +632,6 @@ bool AppInit2(boost::thread_group& threadGroup)
// ********************************************************* Step 6: network initialization
int nSocksVersion = GetArg("-socks", 5);
if (nSocksVersion != 4 && nSocksVersion != 5)
return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion));
@ -733,6 +731,7 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -733,6 +731,7 @@ bool AppInit2(boost::thread_group& threadGroup)
fReindex = GetBoolArg("-reindex");
// Todo: Check if needed, because in step 5 we do the same
if (!bitdb.Open(GetDataDir()))
{
string msg = strprintf(_("Error initializing database environment %s!"

4
src/net.cpp

@ -423,13 +423,11 @@ void AddressCurrentlyConnected(const CService& addr) @@ -423,13 +423,11 @@ void AddressCurrentlyConnected(const CService& addr)
CNode* FindNode(const CNetAddr& ip)
{
{
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes)
if ((CNetAddr)pnode->addr == ip)
return (pnode);
}
return NULL;
}
@ -443,13 +441,11 @@ CNode* FindNode(std::string addrName) @@ -443,13 +441,11 @@ CNode* FindNode(std::string addrName)
}
CNode* FindNode(const CService& addr)
{
{
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes)
if ((CService)pnode->addr == addr)
return (pnode);
}
return NULL;
}

1
src/qt/bitcoingui.h

@ -61,6 +61,7 @@ public: @@ -61,6 +61,7 @@ public:
void removeAllWallets();
/** Used by WalletView to allow access to needed QActions */
// Todo: Use Qt signals for these
QAction * getOverviewAction() { return overviewAction; }
QAction * getHistoryAction() { return historyAction; }
QAction * getAddressBookAction() { return addressBookAction; }

1
src/qt/paymentserver.h

@ -37,6 +37,7 @@ class QLocalServer; @@ -37,6 +37,7 @@ class QLocalServer;
class PaymentServer : public QObject
{
Q_OBJECT
private:
bool saveURIs;
QLocalServer* uriServer;

Loading…
Cancel
Save