neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5309

Browse Source 
4574248 [Qt] minor ordering cleanup after new fee selection (Philip Kaufmann)
a01fa30 minor style cleanup after HTTP rest interface merge (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-11-24 14:35:41 +01:00
commit dfc8e1432a
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/key.h
View File

@ -13,9 +13,10 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
struct CExtPubKey;
class CPubKey; class CPubKey;
struct CExtPubKey;
/** /**
* secp256k1: * secp256k1:
* const unsigned int PRIVATE_KEY_SIZE = 279; * const unsigned int PRIVATE_KEY_SIZE = 279;

2
src/qt/sendcoinsdialog.cpp
View File

@ -12,12 +12,12 @@
#include "guiutil.h" #include "guiutil.h"
#include "optionsmodel.h" #include "optionsmodel.h"
#include "sendcoinsentry.h" #include "sendcoinsentry.h"
#include "wallet.h"
#include "walletmodel.h" #include "walletmodel.h"
#include "base58.h" #include "base58.h"
#include "coincontrol.h" #include "coincontrol.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "wallet.h"
#include <QMessageBox> #include <QMessageBox>
#include <QScrollBar> #include <QScrollBar>

18
src/rest.cpp
View File

@ -1,17 +1,18 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <boost/algorithm/string.hpp>
#include "rpcserver.h"
#include "streams.h"
#include "utilstrencodings.h"
#include "core/block.h" #include "core/block.h"
#include "core/transaction.h" #include "core/transaction.h"
#include "version.h"
#include "main.h" #include "main.h"
#include "rpcserver.h"
#include "streams.h"
#include "sync.h" #include "sync.h"
#include "utilstrencodings.h"
#include "version.h"
#include <boost/algorithm/string.hpp>
using namespace std; using namespace std;
using namespace json_spirit; using namespace json_spirit;
@ -163,7 +164,7 @@ static bool rest_tx(AcceptedConnection *conn,
string strJSON = write_string(Value(objTx), false) + "\n"; string strJSON = write_string(Value(objTx), false) + "\n";
conn->stream() << HTTPReply(HTTP_OK, strJSON, fRun) << std::flush; conn->stream() << HTTPReply(HTTP_OK, strJSON, fRun) << std::flush;
return true; return true;
} }
} }
// not reached // not reached
@ -203,4 +204,3 @@ bool HTTPReq_REST(AcceptedConnection *conn,
conn->stream() << HTTPError(HTTP_NOT_FOUND, false) << std::flush; conn->stream() << HTTPError(HTTP_NOT_FOUND, false) << std::flush;
return false; return false;
} }