aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2011-06-11 22:11:58 +0200
committerWladimir J. van der Laan <[email protected]>2011-06-11 22:11:58 +0200
commitba4081c1fcaddf361abd61b2721994eff5475bb3 (patch)
tree8667eac9e13bde9d006407b55b73bacc830f46e6
parentSomewhat confident now, tested on GNOME+KDE, with all types of transactions. ... (diff)
downloaddiscoin-ba4081c1fcaddf361abd61b2721994eff5475bb3.tar.xz
discoin-ba4081c1fcaddf361abd61b2721994eff5475bb3.zip
move back to original directory structure
-rw-r--r--bitcoin.pro182
-rw-r--r--src/base58.h (renamed from core/include/base58.h)0
-rw-r--r--src/bignum.h (renamed from core/include/bignum.h)0
-rw-r--r--src/cryptopp/config.h (renamed from cryptopp/include/cryptopp/config.h)0
-rw-r--r--src/cryptopp/cpu.cpp (renamed from cryptopp/src/cpu.cpp)0
-rw-r--r--src/cryptopp/cpu.h (renamed from cryptopp/include/cryptopp/cpu.h)0
-rw-r--r--src/cryptopp/cryptlib.h (renamed from cryptopp/include/cryptopp/cryptlib.h)0
-rw-r--r--src/cryptopp/iterhash.h (renamed from cryptopp/include/cryptopp/iterhash.h)0
-rw-r--r--src/cryptopp/misc.h (renamed from cryptopp/include/cryptopp/misc.h)0
-rw-r--r--src/cryptopp/pch.h (renamed from cryptopp/include/cryptopp/pch.h)0
-rw-r--r--src/cryptopp/secblock.h (renamed from cryptopp/include/cryptopp/secblock.h)0
-rw-r--r--src/cryptopp/sha.cpp (renamed from cryptopp/src/sha.cpp)0
-rw-r--r--src/cryptopp/sha.h (renamed from cryptopp/include/cryptopp/sha.h)0
-rw-r--r--src/cryptopp/simple.h (renamed from cryptopp/include/cryptopp/simple.h)0
-rw-r--r--src/cryptopp/smartptr.h (renamed from cryptopp/include/cryptopp/smartptr.h)0
-rw-r--r--src/cryptopp/stdcpp.h (renamed from cryptopp/include/cryptopp/stdcpp.h)0
-rw-r--r--src/db.cpp (renamed from core/src/db.cpp)0
-rw-r--r--src/db.h (renamed from core/include/db.h)0
-rw-r--r--src/externui.h (renamed from core/include/externui.h)0
-rw-r--r--src/headers.h (renamed from core/include/headers.h)0
-rw-r--r--src/init.cpp (renamed from core/src/init.cpp)0
-rw-r--r--src/init.h (renamed from core/include/init.h)0
-rw-r--r--src/irc.cpp (renamed from core/src/irc.cpp)0
-rw-r--r--src/irc.h (renamed from core/include/irc.h)0
-rw-r--r--src/json/json_spirit.h (renamed from json/include/json/json_spirit.h)0
-rw-r--r--src/json/json_spirit_error_position.h (renamed from json/include/json/json_spirit_error_position.h)0
-rw-r--r--src/json/json_spirit_reader.cpp (renamed from json/src/json_spirit_reader.cpp)0
-rw-r--r--src/json/json_spirit_reader.h (renamed from json/include/json/json_spirit_reader.h)0
-rw-r--r--src/json/json_spirit_reader_template.h (renamed from json/include/json/json_spirit_reader_template.h)0
-rw-r--r--src/json/json_spirit_stream_reader.h (renamed from json/include/json/json_spirit_stream_reader.h)0
-rw-r--r--src/json/json_spirit_utils.h (renamed from json/include/json/json_spirit_utils.h)0
-rw-r--r--src/json/json_spirit_value.cpp (renamed from json/src/json_spirit_value.cpp)0
-rw-r--r--src/json/json_spirit_value.h (renamed from json/include/json/json_spirit_value.h)0
-rw-r--r--src/json/json_spirit_writer.cpp (renamed from json/src/json_spirit_writer.cpp)0
-rw-r--r--src/json/json_spirit_writer.h (renamed from json/include/json/json_spirit_writer.h)0
-rw-r--r--src/json/json_spirit_writer_template.h (renamed from json/include/json/json_spirit_writer_template.h)0
-rw-r--r--src/key.h (renamed from core/include/key.h)0
-rw-r--r--src/main.cpp (renamed from core/src/main.cpp)0
-rw-r--r--src/main.h (renamed from core/include/main.h)0
-rw-r--r--src/net.cpp (renamed from core/src/net.cpp)0
-rw-r--r--src/net.h (renamed from core/include/net.h)0
-rw-r--r--src/noui.h (renamed from core/include/noui.h)0
-rw-r--r--src/qt/aboutdialog.cpp (renamed from gui/src/aboutdialog.cpp)0
-rw-r--r--src/qt/aboutdialog.h (renamed from gui/include/aboutdialog.h)0
-rw-r--r--src/qt/addressbookdialog.cpp (renamed from gui/src/addressbookdialog.cpp)0
-rw-r--r--src/qt/addressbookdialog.h (renamed from gui/include/addressbookdialog.h)0
-rw-r--r--src/qt/addresstablemodel.cpp (renamed from gui/src/addresstablemodel.cpp)0
-rw-r--r--src/qt/addresstablemodel.h (renamed from gui/include/addresstablemodel.h)0
-rw-r--r--src/qt/bitcoin.cpp (renamed from gui/src/bitcoin.cpp)0
-rw-r--r--src/qt/bitcoin.qrc (renamed from gui/bitcoin.qrc)0
-rw-r--r--src/qt/bitcoinaddressvalidator.cpp (renamed from gui/src/bitcoinaddressvalidator.cpp)0
-rw-r--r--src/qt/bitcoinaddressvalidator.h (renamed from gui/include/bitcoinaddressvalidator.h)0
-rw-r--r--src/qt/bitcoingui.cpp (renamed from gui/src/bitcoingui.cpp)0
-rw-r--r--src/qt/bitcoingui.h (renamed from gui/include/bitcoingui.h)0
-rw-r--r--src/qt/clientmodel.cpp (renamed from gui/src/clientmodel.cpp)0
-rw-r--r--src/qt/clientmodel.h (renamed from gui/include/clientmodel.h)0
-rw-r--r--src/qt/editaddressdialog.cpp (renamed from gui/src/editaddressdialog.cpp)0
-rw-r--r--src/qt/editaddressdialog.h (renamed from gui/include/editaddressdialog.h)0
-rw-r--r--src/qt/forms/aboutdialog.ui (renamed from gui/forms/aboutdialog.ui)0
-rw-r--r--src/qt/forms/addressbookdialog.ui (renamed from gui/forms/addressbookdialog.ui)0
-rw-r--r--src/qt/forms/editaddressdialog.ui (renamed from gui/forms/editaddressdialog.ui)0
-rw-r--r--src/qt/forms/sendcoinsdialog.ui (renamed from gui/forms/sendcoinsdialog.ui)0
-rw-r--r--src/qt/forms/transactiondescdialog.ui (renamed from gui/forms/transactiondescdialog.ui)0
-rw-r--r--src/qt/guiconstants.h (renamed from gui/include/guiconstants.h)0
-rw-r--r--src/qt/guiutil.cpp (renamed from gui/src/guiutil.cpp)0
-rw-r--r--src/qt/guiutil.h (renamed from gui/include/guiutil.h)0
-rw-r--r--src/qt/monitoreddatamapper.cpp (renamed from gui/src/monitoreddatamapper.cpp)0
-rw-r--r--src/qt/monitoreddatamapper.h (renamed from gui/include/monitoreddatamapper.h)0
-rw-r--r--src/qt/optionsdialog.cpp (renamed from gui/src/optionsdialog.cpp)0
-rw-r--r--src/qt/optionsdialog.h (renamed from gui/include/optionsdialog.h)0
-rw-r--r--src/qt/optionsmodel.cpp (renamed from gui/src/optionsmodel.cpp)0
-rw-r--r--src/qt/optionsmodel.h (renamed from gui/include/optionsmodel.h)0
-rw-r--r--src/qt/res/icons/address-book.png (renamed from gui/res/icons/address-book.png)bin1211 -> 1211 bytes
-rw-r--r--src/qt/res/icons/bitcoin.png (renamed from gui/res/icons/bitcoin.png)bin1086 -> 1086 bytes
-rw-r--r--src/qt/res/icons/quit.png (renamed from gui/res/icons/quit.png)bin876 -> 876 bytes
-rw-r--r--src/qt/res/icons/send.png (renamed from gui/res/icons/send.png)bin1485 -> 1485 bytes
-rw-r--r--src/qt/res/icons/toolbar.png (renamed from gui/res/icons/toolbar.png)bin968 -> 968 bytes
-rw-r--r--src/qt/res/images/about.png (renamed from gui/res/images/about.png)bin3488 -> 3488 bytes
-rw-r--r--src/qt/sendcoinsdialog.cpp (renamed from gui/src/sendcoinsdialog.cpp)0
-rw-r--r--src/qt/sendcoinsdialog.h (renamed from gui/include/sendcoinsdialog.h)0
-rw-r--r--src/qt/transactiondesc.cpp (renamed from gui/src/transactiondesc.cpp)0
-rw-r--r--src/qt/transactiondesc.h (renamed from gui/include/transactiondesc.h)0
-rw-r--r--src/qt/transactiondescdialog.cpp (renamed from gui/src/transactiondescdialog.cpp)0
-rw-r--r--src/qt/transactiondescdialog.h (renamed from gui/include/transactiondescdialog.h)0
-rw-r--r--src/qt/transactionrecord.cpp (renamed from gui/src/transactionrecord.cpp)0
-rw-r--r--src/qt/transactionrecord.h (renamed from gui/include/transactionrecord.h)0
-rw-r--r--src/qt/transactiontablemodel.cpp (renamed from gui/src/transactiontablemodel.cpp)0
-rw-r--r--src/qt/transactiontablemodel.h (renamed from gui/include/transactiontablemodel.h)0
-rw-r--r--src/rpc.cpp (renamed from core/src/rpc.cpp)0
-rw-r--r--src/rpc.h (renamed from core/include/rpc.h)0
-rw-r--r--src/script.cpp (renamed from core/src/script.cpp)0
-rw-r--r--src/script.h (renamed from core/include/script.h)0
-rw-r--r--src/serialize.h (renamed from core/include/serialize.h)0
-rw-r--r--src/strlcpy.h (renamed from core/include/strlcpy.h)0
-rw-r--r--src/uint256.h (renamed from core/include/uint256.h)0
-rw-r--r--src/util.cpp (renamed from core/src/util.cpp)0
-rw-r--r--src/util.h (renamed from core/include/util.h)0
97 files changed, 91 insertions, 91 deletions
diff --git a/bitcoin.pro b/bitcoin.pro
index 7758376f7..dd9ea7ff3 100644
--- a/bitcoin.pro
+++ b/bitcoin.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET =
DEPENDPATH += .
-INCLUDEPATH += gui/include core/include cryptopp/include json/include
+INCLUDEPATH += src src/json src/cryptopp src/qt
unix:LIBS += -lssl -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx
macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0
@@ -11,97 +11,97 @@ QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -
# WINDOWS defines, -DSSL, look at build system
# Input
-DEPENDPATH += gui/include core/include cryptopp/include core/include json/include
-HEADERS += gui/include/bitcoingui.h \
- gui/include/transactiontablemodel.h \
- gui/include/addresstablemodel.h \
- gui/include/optionsdialog.h \
- gui/include/sendcoinsdialog.h \
- gui/include/addressbookdialog.h \
- gui/include/aboutdialog.h \
- gui/include/editaddressdialog.h \
- gui/include/bitcoinaddressvalidator.h \
- core/include/base58.h \
- core/include/bignum.h \
- core/include/util.h \
- core/include/uint256.h \
- core/include/serialize.h \
- cryptopp/include/cryptopp/stdcpp.h \
- cryptopp/include/cryptopp/smartptr.h \
- cryptopp/include/cryptopp/simple.h \
- cryptopp/include/cryptopp/sha.h \
- cryptopp/include/cryptopp/secblock.h \
- cryptopp/include/cryptopp/pch.h \
- cryptopp/include/cryptopp/misc.h \
- cryptopp/include/cryptopp/iterhash.h \
- cryptopp/include/cryptopp/cryptlib.h \
- cryptopp/include/cryptopp/cpu.h \
- cryptopp/include/cryptopp/config.h \
- core/include/strlcpy.h \
- core/include/main.h \
- core/include/net.h \
- core/include/key.h \
- core/include/db.h \
- core/include/script.h \
- core/include/noui.h \
- core/include/init.h \
- core/include/headers.h \
- core/include/irc.h \
- json/include/json/json_spirit_writer_template.h \
- json/include/json/json_spirit_writer.h \
- json/include/json/json_spirit_value.h \
- json/include/json/json_spirit_utils.h \
- json/include/json/json_spirit_stream_reader.h \
- json/include/json/json_spirit_reader_template.h \
- json/include/json/json_spirit_reader.h \
- json/include/json/json_spirit_error_position.h \
- json/include/json/json_spirit.h \
- core/include/rpc.h \
- gui/include/clientmodel.h \
- gui/include/guiutil.h \
- gui/include/transactionrecord.h \
- gui/include/guiconstants.h \
- gui/include/optionsmodel.h \
- gui/include/monitoreddatamapper.h \
- core/include/externui.h \
- gui/include/transactiondesc.h \
- gui/include/transactiondescdialog.h
-SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
- gui/src/transactiontablemodel.cpp \
- gui/src/addresstablemodel.cpp \
- gui/src/optionsdialog.cpp \
- gui/src/sendcoinsdialog.cpp \
- gui/src/addressbookdialog.cpp \
- gui/src/aboutdialog.cpp \
- gui/src/editaddressdialog.cpp \
- gui/src/bitcoinaddressvalidator.cpp \
- cryptopp/src/sha.cpp \
- cryptopp/src/cpu.cpp \
- core/src/util.cpp \
- core/src/script.cpp \
- core/src/main.cpp \
- core/src/init.cpp \
- core/src/rpc.cpp \
- core/src/net.cpp \
- core/src/irc.cpp \
- core/src/db.cpp \
- json/src/json_spirit_writer.cpp \
- json/src/json_spirit_value.cpp \
- json/src/json_spirit_reader.cpp \
- gui/src/clientmodel.cpp \
- gui/src/guiutil.cpp \
- gui/src/transactionrecord.cpp \
- gui/src/optionsmodel.cpp \
- gui/src/monitoreddatamapper.cpp \
- gui/src/transactiondesc.cpp \
- gui/src/transactiondescdialog.cpp
+DEPENDPATH += src/qt src src/cryptopp src json/include
+HEADERS += src/qt/bitcoingui.h \
+ src/qt/transactiontablemodel.h \
+ src/qt/addresstablemodel.h \
+ src/qt/optionsdialog.h \
+ src/qt/sendcoinsdialog.h \
+ src/qt/addressbookdialog.h \
+ src/qt/aboutdialog.h \
+ src/qt/editaddressdialog.h \
+ src/qt/bitcoinaddressvalidator.h \
+ src/base58.h \
+ src/bignum.h \
+ src/util.h \
+ src/uint256.h \
+ src/serialize.h \
+ src/cryptopp/stdcpp.h \
+ src/cryptopp/smartptr.h \
+ src/cryptopp/simple.h \
+ src/cryptopp/sha.h \
+ src/cryptopp/secblock.h \
+ src/cryptopp/pch.h \
+ src/cryptopp/misc.h \
+ src/cryptopp/iterhash.h \
+ src/cryptopp/cryptlib.h \
+ src/cryptopp/cpu.h \
+ src/cryptopp/config.h \
+ src/strlcpy.h \
+ src/main.h \
+ src/net.h \
+ src/key.h \
+ src/db.h \
+ src/script.h \
+ src/noui.h \
+ src/init.h \
+ src/headers.h \
+ src/irc.h \
+ src/json/json_spirit_writer_template.h \
+ src/json/json_spirit_writer.h \
+ src/json/json_spirit_value.h \
+ src/json/json_spirit_utils.h \
+ src/json/json_spirit_stream_reader.h \
+ src/json/json_spirit_reader_template.h \
+ src/json/json_spirit_reader.h \
+ src/json/json_spirit_error_position.h \
+ src/json/json_spirit.h \
+ src/rpc.h \
+ src/qt/clientmodel.h \
+ src/qt/guiutil.h \
+ src/qt/transactionrecord.h \
+ src/qt/guiconstants.h \
+ src/qt/optionsmodel.h \
+ src/qt/monitoreddatamapper.h \
+ src/externui.h \
+ src/qt/transactiondesc.h \
+ src/qt/transactiondescdialog.h
+SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
+ src/qt/transactiontablemodel.cpp \
+ src/qt/addresstablemodel.cpp \
+ src/qt/optionsdialog.cpp \
+ src/qt/sendcoinsdialog.cpp \
+ src/qt/addressbookdialog.cpp \
+ src/qt/aboutdialog.cpp \
+ src/qt/editaddressdialog.cpp \
+ src/qt/bitcoinaddressvalidator.cpp \
+ src/cryptopp/sha.cpp \
+ src/cryptopp/cpu.cpp \
+ src/util.cpp \
+ src/script.cpp \
+ src/main.cpp \
+ src/init.cpp \
+ src/rpc.cpp \
+ src/net.cpp \
+ src/irc.cpp \
+ src/db.cpp \
+ src/json/json_spirit_writer.cpp \
+ src/json/json_spirit_value.cpp \
+ src/json/json_spirit_reader.cpp \
+ src/qt/clientmodel.cpp \
+ src/qt/guiutil.cpp \
+ src/qt/transactionrecord.cpp \
+ src/qt/optionsmodel.cpp \
+ src/qt/monitoreddatamapper.cpp \
+ src/qt/transactiondesc.cpp \
+ src/qt/transactiondescdialog.cpp
RESOURCES += \
- gui/bitcoin.qrc
+ src/qt/bitcoin.qrc
FORMS += \
- gui/forms/sendcoinsdialog.ui \
- gui/forms/addressbookdialog.ui \
- gui/forms/aboutdialog.ui \
- gui/forms/editaddressdialog.ui \
- gui/forms/transactiondescdialog.ui
+ src/qt/forms/sendcoinsdialog.ui \
+ src/qt/forms/addressbookdialog.ui \
+ src/qt/forms/aboutdialog.ui \
+ src/qt/forms/editaddressdialog.ui \
+ src/qt/forms/transactiondescdialog.ui
diff --git a/core/include/base58.h b/src/base58.h
index 580bd3fc6..580bd3fc6 100644
--- a/core/include/base58.h
+++ b/src/base58.h
diff --git a/core/include/bignum.h b/src/bignum.h
index 5b4c78e7f..5b4c78e7f 100644
--- a/core/include/bignum.h
+++ b/src/bignum.h
diff --git a/cryptopp/include/cryptopp/config.h b/src/cryptopp/config.h
index 0737027f4..0737027f4 100644
--- a/cryptopp/include/cryptopp/config.h
+++ b/src/cryptopp/config.h
diff --git a/cryptopp/src/cpu.cpp b/src/cryptopp/cpu.cpp
index d36d3253a..d36d3253a 100644
--- a/cryptopp/src/cpu.cpp
+++ b/src/cryptopp/cpu.cpp
diff --git a/cryptopp/include/cryptopp/cpu.h b/src/cryptopp/cpu.h
index 113b8a1f3..113b8a1f3 100644
--- a/cryptopp/include/cryptopp/cpu.h
+++ b/src/cryptopp/cpu.h
diff --git a/cryptopp/include/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h
index 1461af7b7..1461af7b7 100644
--- a/cryptopp/include/cryptopp/cryptlib.h
+++ b/src/cryptopp/cryptlib.h
diff --git a/cryptopp/include/cryptopp/iterhash.h b/src/cryptopp/iterhash.h
index 0e2a14772..0e2a14772 100644
--- a/cryptopp/include/cryptopp/iterhash.h
+++ b/src/cryptopp/iterhash.h
diff --git a/cryptopp/include/cryptopp/misc.h b/src/cryptopp/misc.h
index 5258e2abc..5258e2abc 100644
--- a/cryptopp/include/cryptopp/misc.h
+++ b/src/cryptopp/misc.h
diff --git a/cryptopp/include/cryptopp/pch.h b/src/cryptopp/pch.h
index 418c39076..418c39076 100644
--- a/cryptopp/include/cryptopp/pch.h
+++ b/src/cryptopp/pch.h
diff --git a/cryptopp/include/cryptopp/secblock.h b/src/cryptopp/secblock.h
index 6433f9734..6433f9734 100644
--- a/cryptopp/include/cryptopp/secblock.h
+++ b/src/cryptopp/secblock.h
diff --git a/cryptopp/src/sha.cpp b/src/cryptopp/sha.cpp
index 1ff6c0b45..1ff6c0b45 100644
--- a/cryptopp/src/sha.cpp
+++ b/src/cryptopp/sha.cpp
diff --git a/cryptopp/include/cryptopp/sha.h b/src/cryptopp/sha.h
index 8d0dbfcac..8d0dbfcac 100644
--- a/cryptopp/include/cryptopp/sha.h
+++ b/src/cryptopp/sha.h
diff --git a/cryptopp/include/cryptopp/simple.h b/src/cryptopp/simple.h
index 8b1378917..8b1378917 100644
--- a/cryptopp/include/cryptopp/simple.h
+++ b/src/cryptopp/simple.h
diff --git a/cryptopp/include/cryptopp/smartptr.h b/src/cryptopp/smartptr.h
index fa0daec3d..fa0daec3d 100644
--- a/cryptopp/include/cryptopp/smartptr.h
+++ b/src/cryptopp/smartptr.h
diff --git a/cryptopp/include/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h
index 9a468ab61..9a468ab61 100644
--- a/cryptopp/include/cryptopp/stdcpp.h
+++ b/src/cryptopp/stdcpp.h
diff --git a/core/src/db.cpp b/src/db.cpp
index 52c0f5b4c..52c0f5b4c 100644
--- a/core/src/db.cpp
+++ b/src/db.cpp
diff --git a/core/include/db.h b/src/db.h
index 9826194ed..9826194ed 100644
--- a/core/include/db.h
+++ b/src/db.h
diff --git a/core/include/externui.h b/src/externui.h
index e58ccc224..e58ccc224 100644
--- a/core/include/externui.h
+++ b/src/externui.h
diff --git a/core/include/headers.h b/src/headers.h
index 33aeef338..33aeef338 100644
--- a/core/include/headers.h
+++ b/src/headers.h
diff --git a/core/src/init.cpp b/src/init.cpp
index f7a1ce9ef..f7a1ce9ef 100644
--- a/core/src/init.cpp
+++ b/src/init.cpp
diff --git a/core/include/init.h b/src/init.h
index 61b272857..61b272857 100644
--- a/core/include/init.h
+++ b/src/init.h
diff --git a/core/src/irc.cpp b/src/irc.cpp
index a76374d14..a76374d14 100644
--- a/core/src/irc.cpp
+++ b/src/irc.cpp
diff --git a/core/include/irc.h b/src/irc.h
index 18e53597f..18e53597f 100644
--- a/core/include/irc.h
+++ b/src/irc.h
diff --git a/json/include/json/json_spirit.h b/src/json/json_spirit.h
index ac1879d5b..ac1879d5b 100644
--- a/json/include/json/json_spirit.h
+++ b/src/json/json_spirit.h
diff --git a/json/include/json/json_spirit_error_position.h b/src/json/json_spirit_error_position.h
index 17208507d..17208507d 100644
--- a/json/include/json/json_spirit_error_position.h
+++ b/src/json/json_spirit_error_position.h
diff --git a/json/src/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp
index 3469bf17a..3469bf17a 100644
--- a/json/src/json_spirit_reader.cpp
+++ b/src/json/json_spirit_reader.cpp
diff --git a/json/include/json/json_spirit_reader.h b/src/json/json_spirit_reader.h
index 96494a978..96494a978 100644
--- a/json/include/json/json_spirit_reader.h
+++ b/src/json/json_spirit_reader.h
diff --git a/json/include/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h
index 4dec00e6c..4dec00e6c 100644
--- a/json/include/json/json_spirit_reader_template.h
+++ b/src/json/json_spirit_reader_template.h
diff --git a/json/include/json/json_spirit_stream_reader.h b/src/json/json_spirit_stream_reader.h
index 7e59c9adc..7e59c9adc 100644
--- a/json/include/json/json_spirit_stream_reader.h
+++ b/src/json/json_spirit_stream_reader.h
diff --git a/json/include/json/json_spirit_utils.h b/src/json/json_spirit_utils.h
index 553e3b96a..553e3b96a 100644
--- a/json/include/json/json_spirit_utils.h
+++ b/src/json/json_spirit_utils.h
diff --git a/json/src/json_spirit_value.cpp b/src/json/json_spirit_value.cpp
index 2d7236855..2d7236855 100644
--- a/json/src/json_spirit_value.cpp
+++ b/src/json/json_spirit_value.cpp
diff --git a/json/include/json/json_spirit_value.h b/src/json/json_spirit_value.h
index 7e83a2a7e..7e83a2a7e 100644
--- a/json/include/json/json_spirit_value.h
+++ b/src/json/json_spirit_value.h
diff --git a/json/src/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp
index 32dfeb2c6..32dfeb2c6 100644
--- a/json/src/json_spirit_writer.cpp
+++ b/src/json/json_spirit_writer.cpp
diff --git a/json/include/json/json_spirit_writer.h b/src/json/json_spirit_writer.h
index 52e14068e..52e14068e 100644
--- a/json/include/json/json_spirit_writer.h
+++ b/src/json/json_spirit_writer.h
diff --git a/json/include/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h
index 28c49ddc6..28c49ddc6 100644
--- a/json/include/json/json_spirit_writer_template.h
+++ b/src/json/json_spirit_writer_template.h
diff --git a/core/include/key.h b/src/key.h
index c973d6eb8..c973d6eb8 100644
--- a/core/include/key.h
+++ b/src/key.h
diff --git a/core/src/main.cpp b/src/main.cpp
index 0456041ee..0456041ee 100644
--- a/core/src/main.cpp
+++ b/src/main.cpp
diff --git a/core/include/main.h b/src/main.h
index 8d9b39f71..8d9b39f71 100644
--- a/core/include/main.h
+++ b/src/main.h
diff --git a/core/src/net.cpp b/src/net.cpp
index 39360a334..39360a334 100644
--- a/core/src/net.cpp
+++ b/src/net.cpp
diff --git a/core/include/net.h b/src/net.h
index d1ded8723..d1ded8723 100644
--- a/core/include/net.h
+++ b/src/net.h
diff --git a/core/include/noui.h b/src/noui.h
index afb19526c..afb19526c 100644
--- a/core/include/noui.h
+++ b/src/noui.h
diff --git a/gui/src/aboutdialog.cpp b/src/qt/aboutdialog.cpp
index 13347961d..13347961d 100644
--- a/gui/src/aboutdialog.cpp
+++ b/src/qt/aboutdialog.cpp
diff --git a/gui/include/aboutdialog.h b/src/qt/aboutdialog.h
index 827cc741c..827cc741c 100644
--- a/gui/include/aboutdialog.h
+++ b/src/qt/aboutdialog.h
diff --git a/gui/src/addressbookdialog.cpp b/src/qt/addressbookdialog.cpp
index 90950a644..90950a644 100644
--- a/gui/src/addressbookdialog.cpp
+++ b/src/qt/addressbookdialog.cpp
diff --git a/gui/include/addressbookdialog.h b/src/qt/addressbookdialog.h
index bf7c2a65a..bf7c2a65a 100644
--- a/gui/include/addressbookdialog.h
+++ b/src/qt/addressbookdialog.h
diff --git a/gui/src/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 91b87fb7f..91b87fb7f 100644
--- a/gui/src/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
diff --git a/gui/include/addresstablemodel.h b/src/qt/addresstablemodel.h
index 879941433..879941433 100644
--- a/gui/include/addresstablemodel.h
+++ b/src/qt/addresstablemodel.h
diff --git a/gui/src/bitcoin.cpp b/src/qt/bitcoin.cpp
index e00326742..e00326742 100644
--- a/gui/src/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
diff --git a/gui/bitcoin.qrc b/src/qt/bitcoin.qrc
index 80904b341..80904b341 100644
--- a/gui/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
diff --git a/gui/src/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
index 761a26693..761a26693 100644
--- a/gui/src/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
diff --git a/gui/include/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h
index 73f6ea1f6..73f6ea1f6 100644
--- a/gui/include/bitcoinaddressvalidator.h
+++ b/src/qt/bitcoinaddressvalidator.h
diff --git a/gui/src/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index c08476cec..c08476cec 100644
--- a/gui/src/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
diff --git a/gui/include/bitcoingui.h b/src/qt/bitcoingui.h
index 96452ef18..96452ef18 100644
--- a/gui/include/bitcoingui.h
+++ b/src/qt/bitcoingui.h
diff --git a/gui/src/clientmodel.cpp b/src/qt/clientmodel.cpp
index 97391e093..97391e093 100644
--- a/gui/src/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
diff --git a/gui/include/clientmodel.h b/src/qt/clientmodel.h
index 09d1fc921..09d1fc921 100644
--- a/gui/include/clientmodel.h
+++ b/src/qt/clientmodel.h
diff --git a/gui/src/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index dd0541760..dd0541760 100644
--- a/gui/src/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
diff --git a/gui/include/editaddressdialog.h b/src/qt/editaddressdialog.h
index 6f396d045..6f396d045 100644
--- a/gui/include/editaddressdialog.h
+++ b/src/qt/editaddressdialog.h
diff --git a/gui/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
index 45915c85b..45915c85b 100644
--- a/gui/forms/aboutdialog.ui
+++ b/src/qt/forms/aboutdialog.ui
diff --git a/gui/forms/addressbookdialog.ui b/src/qt/forms/addressbookdialog.ui
index 2b3c69fb9..2b3c69fb9 100644
--- a/gui/forms/addressbookdialog.ui
+++ b/src/qt/forms/addressbookdialog.ui
diff --git a/gui/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui
index f0ba28a85..f0ba28a85 100644
--- a/gui/forms/editaddressdialog.ui
+++ b/src/qt/forms/editaddressdialog.ui
diff --git a/gui/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 595b7f40f..595b7f40f 100644
--- a/gui/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
diff --git a/gui/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui
index 2f70a3821..2f70a3821 100644
--- a/gui/forms/transactiondescdialog.ui
+++ b/src/qt/forms/transactiondescdialog.ui
diff --git a/gui/include/guiconstants.h b/src/qt/guiconstants.h
index cdd1a74d9..cdd1a74d9 100644
--- a/gui/include/guiconstants.h
+++ b/src/qt/guiconstants.h
diff --git a/gui/src/guiutil.cpp b/src/qt/guiutil.cpp
index a81cc14fe..a81cc14fe 100644
--- a/gui/src/guiutil.cpp
+++ b/src/qt/guiutil.cpp
diff --git a/gui/include/guiutil.h b/src/qt/guiutil.h
index 748e29bf3..748e29bf3 100644
--- a/gui/include/guiutil.h
+++ b/src/qt/guiutil.h
diff --git a/gui/src/monitoreddatamapper.cpp b/src/qt/monitoreddatamapper.cpp
index e70aa7ebf..e70aa7ebf 100644
--- a/gui/src/monitoreddatamapper.cpp
+++ b/src/qt/monitoreddatamapper.cpp
diff --git a/gui/include/monitoreddatamapper.h b/src/qt/monitoreddatamapper.h
index 4dd2d1a86..4dd2d1a86 100644
--- a/gui/include/monitoreddatamapper.h
+++ b/src/qt/monitoreddatamapper.h
diff --git a/gui/src/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index d46b48fb2..d46b48fb2 100644
--- a/gui/src/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
diff --git a/gui/include/optionsdialog.h b/src/qt/optionsdialog.h
index 07e85297d..07e85297d 100644
--- a/gui/include/optionsdialog.h
+++ b/src/qt/optionsdialog.h
diff --git a/gui/src/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1528fdf69..1528fdf69 100644
--- a/gui/src/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
diff --git a/gui/include/optionsmodel.h b/src/qt/optionsmodel.h
index 0124e2ab4..0124e2ab4 100644
--- a/gui/include/optionsmodel.h
+++ b/src/qt/optionsmodel.h
diff --git a/gui/res/icons/address-book.png b/src/qt/res/icons/address-book.png
index abfb3c3a5..abfb3c3a5 100644
--- a/gui/res/icons/address-book.png
+++ b/src/qt/res/icons/address-book.png
Binary files differ
diff --git a/gui/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
index 09520aca2..09520aca2 100644
--- a/gui/res/icons/bitcoin.png
+++ b/src/qt/res/icons/bitcoin.png
Binary files differ
diff --git a/gui/res/icons/quit.png b/src/qt/res/icons/quit.png
index fb510fbea..fb510fbea 100644
--- a/gui/res/icons/quit.png
+++ b/src/qt/res/icons/quit.png
Binary files differ
diff --git a/gui/res/icons/send.png b/src/qt/res/icons/send.png
index 0ba5359d7..0ba5359d7 100644
--- a/gui/res/icons/send.png
+++ b/src/qt/res/icons/send.png
Binary files differ
diff --git a/gui/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png
index f2dcb2063..f2dcb2063 100644
--- a/gui/res/icons/toolbar.png
+++ b/src/qt/res/icons/toolbar.png
Binary files differ
diff --git a/gui/res/images/about.png b/src/qt/res/images/about.png
index c9ab9511e..c9ab9511e 100644
--- a/gui/res/images/about.png
+++ b/src/qt/res/images/about.png
Binary files differ
diff --git a/gui/src/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 721ab1410..721ab1410 100644
--- a/gui/src/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
diff --git a/gui/include/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index f73c38d63..f73c38d63 100644
--- a/gui/include/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
diff --git a/gui/src/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 4d8a55e99..4d8a55e99 100644
--- a/gui/src/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
diff --git a/gui/include/transactiondesc.h b/src/qt/transactiondesc.h
index 5a8594934..5a8594934 100644
--- a/gui/include/transactiondesc.h
+++ b/src/qt/transactiondesc.h
diff --git a/gui/src/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
index 3bd4808cb..3bd4808cb 100644
--- a/gui/src/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
diff --git a/gui/include/transactiondescdialog.h b/src/qt/transactiondescdialog.h
index 4f8f754b2..4f8f754b2 100644
--- a/gui/include/transactiondescdialog.h
+++ b/src/qt/transactiondescdialog.h
diff --git a/gui/src/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 6c1f3a5e5..6c1f3a5e5 100644
--- a/gui/src/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
diff --git a/gui/include/transactionrecord.h b/src/qt/transactionrecord.h
index c082fffe9..c082fffe9 100644
--- a/gui/include/transactionrecord.h
+++ b/src/qt/transactionrecord.h
diff --git a/gui/src/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 8fe183993..8fe183993 100644
--- a/gui/src/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
diff --git a/gui/include/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 5974c0e7f..5974c0e7f 100644
--- a/gui/include/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
diff --git a/core/src/rpc.cpp b/src/rpc.cpp
index 530bef4a4..530bef4a4 100644
--- a/core/src/rpc.cpp
+++ b/src/rpc.cpp
diff --git a/core/include/rpc.h b/src/rpc.h
index 48a7b8a8a..48a7b8a8a 100644
--- a/core/include/rpc.h
+++ b/src/rpc.h
diff --git a/core/src/script.cpp b/src/script.cpp
index 97334ca0a..97334ca0a 100644
--- a/core/src/script.cpp
+++ b/src/script.cpp
diff --git a/core/include/script.h b/src/script.h
index 22a6020dc..22a6020dc 100644
--- a/core/include/script.h
+++ b/src/script.h
diff --git a/core/include/serialize.h b/src/serialize.h
index 0d66d6a95..0d66d6a95 100644
--- a/core/include/serialize.h
+++ b/src/serialize.h
diff --git a/core/include/strlcpy.h b/src/strlcpy.h
index d4d1908e7..d4d1908e7 100644
--- a/core/include/strlcpy.h
+++ b/src/strlcpy.h
diff --git a/core/include/uint256.h b/src/uint256.h
index 14feb1683..14feb1683 100644
--- a/core/include/uint256.h
+++ b/src/uint256.h
diff --git a/core/src/util.cpp b/src/util.cpp
index 619910928..619910928 100644
--- a/core/src/util.cpp
+++ b/src/util.cpp
diff --git a/core/include/util.h b/src/util.h
index 32a98e626..32a98e626 100644
--- a/core/include/util.h
+++ b/src/util.h