aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-06-16 16:30:38 +0200
committerWladimir J. van der Laan <[email protected]>2014-06-16 17:42:54 +0200
commit09eb201b1b3ed808e5167245149f5635d4eaf6f9 (patch)
tree0fc95f43c7355321cbd2b79603edfdcea42e962d /src/qt
parentMerge pull request #4326 (diff)
downloaddiscoin-09eb201b1b3ed808e5167245149f5635d4eaf6f9.tar.xz
discoin-09eb201b1b3ed808e5167245149f5635d4eaf6f9.zip
Remove `using namespace std` from header file
It's considered bad form to import things into the global namespace in a header. Put it in the cpp files where it is needed instead.
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/paymentrequestplus.cpp1
-rw-r--r--src/qt/paymentrequestplus.h2
-rw-r--r--src/qt/paymentserver.cpp1
-rw-r--r--src/qt/transactiondesc.cpp2
-rw-r--r--src/qt/walletmodel.cpp2
5 files changed, 7 insertions, 1 deletions
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index e369734a9..464f995eb 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -17,6 +17,7 @@
#include <QDebug>
#include <QSslCertificate>
+using namespace std;
class SSLVerifyError : public std::runtime_error
{
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
index 8c126b1fa..3c4861a4d 100644
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -24,7 +24,7 @@ public:
PaymentRequestPlus() { }
bool parse(const QByteArray& data);
- bool SerializeToString(string* output) const;
+ bool SerializeToString(std::string* output) const;
bool IsInitialized() const;
QString getPKIType() const;
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index eb6ab879a..49923a1af 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -44,6 +44,7 @@
#include <QUrlQuery>
#endif
+using namespace std;
using namespace boost;
const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 0cfcb048c..61da3373f 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -18,6 +18,8 @@
#include <stdint.h>
#include <string>
+using namespace std;
+
QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
{
AssertLockHeld(cs_main);
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 87ff3db58..2f633a26c 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -24,6 +24,8 @@
#include <QSet>
#include <QTimer>
+using namespace std;
+
WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
transactionTableModel(0),