diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-08-21 16:11:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-08-26 13:25:22 +0200 |
| commit | ad49c256c33bfe4088fd3c7ecb7d28cb81a8fc70 (patch) | |
| tree | c4152c73cf6a424a882a125fa89c59ee6869bb86 /src/qt | |
| parent | Move `COIN` and `CENT` to core.h (diff) | |
| download | discoin-ad49c256c33bfe4088fd3c7ecb7d28cb81a8fc70.tar.xz discoin-ad49c256c33bfe4088fd3c7ecb7d28cb81a8fc70.zip | |
Split up util.cpp/h
Split up util.cpp/h into:
- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)
The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).
Breaks dependency of sha256.cpp on all the things pulled in by util.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 1 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 1 | ||||
| -rw-r--r-- | src/qt/clientmodel.cpp | 1 | ||||
| -rw-r--r-- | src/qt/optionsdialog.cpp | 1 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 1 | ||||
| -rw-r--r-- | src/qt/transactiondesc.cpp | 1 | ||||
| -rw-r--r-- | src/qt/utilitydialog.cpp | 3 |
7 files changed, 8 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index a43e7cb75..12277a8ad 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -33,6 +33,7 @@ #include <stdint.h> #include <boost/filesystem/operations.hpp> +#include <boost/thread.hpp> #include <QApplication> #include <QDebug> #include <QLibraryInfo> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index bfca5e8d1..d0a5ff13c 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -24,6 +24,7 @@ #endif #include "init.h" +#include "util.h" #include "ui_interface.h" #include <iostream> diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 4c21eb559..9c9ff5b3a 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -13,6 +13,7 @@ #include "main.h" #include "net.h" #include "ui_interface.h" +#include "util.h" #include <stdint.h> diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index fd1d446f9..c775a7f8d 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -21,6 +21,7 @@ #include "wallet.h" // for CWallet::minTxFee #endif +#include <boost/thread.hpp> #include <QDir> #include <QIntValidator> #include <QLocale> diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index a9f1566d6..f6a4b599d 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -11,6 +11,7 @@ #include "base58.h" #include "ui_interface.h" +#include "util.h" #include "wallet.h" #include <cstdlib> diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 4f6e3169f..8258e719a 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -15,6 +15,7 @@ #include "transactionrecord.h" #include "timedata.h" #include "ui_interface.h" +#include "util.h" #include "wallet.h" #include <stdint.h> diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 1a39894c9..7df9d1bc2 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -11,9 +11,10 @@ #include "guiutil.h" #include "init.h" -#include "util.h" #include "version.h" +#include <stdio.h> + #include <QLabel> #include <QRegExp> #include <QVBoxLayout> |