diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -132,8 +132,8 @@ compat/glibcxx_sanity.cpp compat/strnlen.cpp fs.cpp - interface/handler.cpp - interface/node.cpp + interfaces/handler.cpp + interfaces/node.cpp logging.cpp random.cpp rcu.cpp diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -141,8 +141,8 @@ httpserver.h \ indirectmap.h \ init.h \ - interface/handler.h \ - interface/node.h \ + interfaces/handler.h \ + interfaces/node.h \ key.h \ keystore.h \ dbwrapper.h \ @@ -434,8 +434,8 @@ compat/glibcxx_sanity.cpp \ compat/strnlen.cpp \ fs.cpp \ - interface/handler.cpp \ - interface/node.cpp \ + interfaces/handler.cpp \ + interfaces/node.cpp \ logging.cpp \ random.cpp \ rcu.cpp \ diff --git a/src/interface/handler.h b/src/interfaces/handler.h rename from src/interface/handler.h rename to src/interfaces/handler.h diff --git a/src/interface/handler.cpp b/src/interfaces/handler.cpp rename from src/interface/handler.cpp rename to src/interfaces/handler.cpp --- a/src/interface/handler.cpp +++ b/src/interfaces/handler.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include diff --git a/src/interface/node.h b/src/interfaces/node.h rename from src/interface/node.h rename to src/interfaces/node.h diff --git a/src/interface/node.cpp b/src/interfaces/node.cpp rename from src/interface/node.cpp rename to src/interfaces/node.cpp --- a/src/interface/node.cpp +++ b/src/interfaces/node.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -28,8 +28,8 @@ #endif #include "init.h" -#include "interface/handler.h" -#include "interface/node.h" +#include "interfaces/handler.h" +#include "interfaces/node.h" #include "rpc/server.h" #include "ui_interface.h" #include "uint256.h" diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -34,8 +34,8 @@ #include "chainparams.h" #include "init.h" -#include "interface/handler.h" -#include "interface/node.h" +#include "interfaces/handler.h" +#include "interfaces/node.h" #include "ui_interface.h" #include "util.h" diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -12,7 +12,7 @@ #include "guiutil.h" #include "amount.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "intro.h" #include "net.h" #include "netbase.h" diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -8,7 +8,7 @@ #include "paymentrequestdata.h" #include "amount.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "random.h" #include "script/script.h" #include "script/standard.h" diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -3,7 +3,7 @@ #include "chainparams.h" #include "config.h" #include "dstencode.h" -#include "interface/node.h" +#include "interfaces/node.h" #include "qt/bitcoinamountfield.h" #include "qt/optionsmodel.h" #include "qt/overviewpage.h"