move back to original directory structure

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
+DEPENDPATH += src/qt src src/cryptopp src json/include
-HEADERS += gui/include/bitcoingui.h \
+HEADERS += src/qt/bitcoingui.h \
-    gui/include/transactiontablemodel.h \
+    src/qt/transactiontablemodel.h \
-    gui/include/addresstablemodel.h \
+    src/qt/addresstablemodel.h \
-    gui/include/optionsdialog.h \
+    src/qt/optionsdialog.h \
-    gui/include/sendcoinsdialog.h \
+    src/qt/sendcoinsdialog.h \
-    gui/include/addressbookdialog.h \
+    src/qt/addressbookdialog.h \
-    gui/include/aboutdialog.h \
+    src/qt/aboutdialog.h \
-    gui/include/editaddressdialog.h \
+    src/qt/editaddressdialog.h \
-    gui/include/bitcoinaddressvalidator.h \
+    src/qt/bitcoinaddressvalidator.h \
-    core/include/base58.h \
+    src/base58.h \
-    core/include/bignum.h \
+    src/bignum.h \
-    core/include/util.h \
+    src/util.h \
-    core/include/uint256.h \
+    src/uint256.h \
-    core/include/serialize.h \
+    src/serialize.h \
-    cryptopp/include/cryptopp/stdcpp.h \
+    src/cryptopp/stdcpp.h \
-    cryptopp/include/cryptopp/smartptr.h \
+    src/cryptopp/smartptr.h \
-    cryptopp/include/cryptopp/simple.h \
+    src/cryptopp/simple.h \
-    cryptopp/include/cryptopp/sha.h \
+    src/cryptopp/sha.h \
-    cryptopp/include/cryptopp/secblock.h \
+    src/cryptopp/secblock.h \
-    cryptopp/include/cryptopp/pch.h \
+    src/cryptopp/pch.h \
-    cryptopp/include/cryptopp/misc.h \
+    src/cryptopp/misc.h \
-    cryptopp/include/cryptopp/iterhash.h \
+    src/cryptopp/iterhash.h \
-    cryptopp/include/cryptopp/cryptlib.h \
+    src/cryptopp/cryptlib.h \
-    cryptopp/include/cryptopp/cpu.h \
+    src/cryptopp/cpu.h \
-    cryptopp/include/cryptopp/config.h \
+    src/cryptopp/config.h \
-    core/include/strlcpy.h \
+    src/strlcpy.h \
-    core/include/main.h \
+    src/main.h \
-    core/include/net.h \
+    src/net.h \
-    core/include/key.h \
+    src/key.h \
-    core/include/db.h \
+    src/db.h \
-    core/include/script.h \
+    src/script.h \
-    core/include/noui.h \
+    src/noui.h \
-    core/include/init.h \
+    src/init.h \
-    core/include/headers.h \
+    src/headers.h \
-    core/include/irc.h \
+    src/irc.h \
-    json/include/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer_template.h \
-    json/include/json/json_spirit_writer.h \
+    src/json/json_spirit_writer.h \
-    json/include/json/json_spirit_value.h \
+    src/json/json_spirit_value.h \
-    json/include/json/json_spirit_utils.h \
+    src/json/json_spirit_utils.h \
-    json/include/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_stream_reader.h \
-    json/include/json/json_spirit_reader_template.h \
+    src/json/json_spirit_reader_template.h \
-    json/include/json/json_spirit_reader.h \
+    src/json/json_spirit_reader.h \
-    json/include/json/json_spirit_error_position.h \
+    src/json/json_spirit_error_position.h \
-    json/include/json/json_spirit.h \
+    src/json/json_spirit.h \
-    core/include/rpc.h \
+    src/rpc.h \
-    gui/include/clientmodel.h \
+    src/qt/clientmodel.h \
-    gui/include/guiutil.h \
+    src/qt/guiutil.h \
-    gui/include/transactionrecord.h \
+    src/qt/transactionrecord.h \
-    gui/include/guiconstants.h \
+    src/qt/guiconstants.h \
-    gui/include/optionsmodel.h \
+    src/qt/optionsmodel.h \
-    gui/include/monitoreddatamapper.h \
+    src/qt/monitoreddatamapper.h \
-    core/include/externui.h \
+    src/externui.h \
-    gui/include/transactiondesc.h \
+    src/qt/transactiondesc.h \
-    gui/include/transactiondescdialog.h
+    src/qt/transactiondescdialog.h
-SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
+SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
-    gui/src/transactiontablemodel.cpp \
+    src/qt/transactiontablemodel.cpp \
-    gui/src/addresstablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
-    gui/src/optionsdialog.cpp \
+    src/qt/optionsdialog.cpp \
-    gui/src/sendcoinsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
-    gui/src/addressbookdialog.cpp \
+    src/qt/addressbookdialog.cpp \
-    gui/src/aboutdialog.cpp \
+    src/qt/aboutdialog.cpp \
-    gui/src/editaddressdialog.cpp \
+    src/qt/editaddressdialog.cpp \
-    gui/src/bitcoinaddressvalidator.cpp \
+    src/qt/bitcoinaddressvalidator.cpp \
-    cryptopp/src/sha.cpp \
+    src/cryptopp/sha.cpp \
-    cryptopp/src/cpu.cpp \
+    src/cryptopp/cpu.cpp \
-    core/src/util.cpp \
+    src/util.cpp \
-    core/src/script.cpp \
+    src/script.cpp \
-    core/src/main.cpp \
+    src/main.cpp \
-    core/src/init.cpp \
+    src/init.cpp \
-    core/src/rpc.cpp \
+    src/rpc.cpp \
-    core/src/net.cpp \
+    src/net.cpp \
-    core/src/irc.cpp \
+    src/irc.cpp \
-    core/src/db.cpp \
+    src/db.cpp \
-    json/src/json_spirit_writer.cpp \
+    src/json/json_spirit_writer.cpp \
-    json/src/json_spirit_value.cpp \
+    src/json/json_spirit_value.cpp \
-    json/src/json_spirit_reader.cpp \
+    src/json/json_spirit_reader.cpp \
-    gui/src/clientmodel.cpp \
+    src/qt/clientmodel.cpp \
-    gui/src/guiutil.cpp \
+    src/qt/guiutil.cpp \
-    gui/src/transactionrecord.cpp \
+    src/qt/transactionrecord.cpp \
-    gui/src/optionsmodel.cpp \
+    src/qt/optionsmodel.cpp \
-    gui/src/monitoreddatamapper.cpp \
+    src/qt/monitoreddatamapper.cpp \
-    gui/src/transactiondesc.cpp \
+    src/qt/transactiondesc.cpp \
-    gui/src/transactiondescdialog.cpp
+    src/qt/transactiondescdialog.cpp
 
 RESOURCES += \
-    gui/bitcoin.qrc
+    src/qt/bitcoin.qrc
 
 FORMS += \
-    gui/forms/sendcoinsdialog.ui \
+    src/qt/forms/sendcoinsdialog.ui \
-    gui/forms/addressbookdialog.ui \
+    src/qt/forms/addressbookdialog.ui \
-    gui/forms/aboutdialog.ui \
+    src/qt/forms/aboutdialog.ui \
-    gui/forms/editaddressdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
-    gui/forms/transactiondescdialog.ui
+    src/qt/forms/transactiondescdialog.ui