aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.h
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-08-31 01:11:12 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-09-09 12:36:04 +0200
commitd78900cc1bb188a29dfb23b1f41b00f35ceb69f7 (patch)
tree4d17c023e872e61a6011ab5fd9b92a682dd3f716 /src/qt/paymentserver.h
parent4c723841e25650f045ed55b1e6a619d6d43398d5 (diff)
downloadbitcoin-d78900cc1bb188a29dfb23b1f41b00f35ceb69f7.tar.xz
fix some cosmetic glitches in the codebase
- rename URL into URI in paymentserver where correct - add some missing Qt-coding-stuff in paymentserver - change QSpinBox to QLineEdit as base for BitcoinAmountField in .ui files (as this is the result when converting the BAF back into base) - remove some c_str() and replace with QString::fromStdString() - remove several new-lines - remove unneeded spaces - indentation fixes
Diffstat (limited to 'src/qt/paymentserver.h')
-rw-r--r--src/qt/paymentserver.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 131ede518e..f9d827204b 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -36,6 +36,8 @@
class CWallet;
class OptionsModel;
+
+QT_BEGIN_NAMESPACE
class QApplication;
class QByteArray;
class QLocalServer;
@@ -43,6 +45,7 @@ class QNetworkAccessManager;
class QNetworkReply;
class QSslError;
class QUrl;
+QT_END_NAMESPACE
class PaymentServer : public QObject
{
@@ -56,8 +59,8 @@ public:
// will be called so we startup in the right mode.
static bool ipcSendCommandLine(int argc, char *argv[]);
- PaymentServer(QObject* parent, // parent should be QApplication object
- bool startLocalServer=true);
+ // parent should be QApplication object
+ PaymentServer(QObject* parent, bool startLocalServer = true);
~PaymentServer();
// Load root certificate authorities. Pass NULL (default)
@@ -65,7 +68,7 @@ public:
// or, if that's not set, to use the system default root certificates.
// If you pass in a store, you should not X509_STORE_free it: it will be
// freed either at exit or when another set of CAs are loaded.
- static void LoadRootCAs(X509_STORE* store=NULL);
+ static void LoadRootCAs(X509_STORE* store = NULL);
// Return certificate store
static X509_STORE* getCertStore() { return certStore; }