Merge #335: Move backend models into models directory

97697b2 qml: move backend models into models directory (jarolrod)

Pull request description:

  This is a plus for code organization.

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/unsecure_win_gui.zip?branch=pull/335)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/unsecure_mac_gui.zip?branch=pull/335)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/unsecure_mac_arm64_gui.zip?branch=pull/335)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/unsecure_android_apk.zip?branch=pull/335)
  [![ARM32 Android](https://img.shields.io/badge/OS-Android%2032bit-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android32/unsecure_android_32bit_apk.zip?branch=pull/335)

ACKs for top commit:
  johnny9:
    ACK 97697b2

Tree-SHA512: 604557a1ed7d7e8ff609dd9fbe3a0b862a07803156fee054be8c727b895cc884f3a4fe953bc2b58080b63ab34e9b507a41f42103146731020d23af26d1533b72

Author: hebasto

.gitignore

@@ -48,6 +48,7 @@ src/qt/*.moc
 src/qt/moc_*.cpp
 src/qml/components/moc_*.cpp
 src/qml/controls/moc_*.cpp
+src/qml/models/moc_*.cpp
 src/qt/forms/ui_*.h
 
 src/qt/test/moc*.cpp

src/Makefile.qt.include

@@ -37,12 +37,12 @@ QT_FORMS_UI = \
 QT_MOC_CPP = \
   qml/components/moc_blockclockdial.cpp \
   qml/controls/moc_linegraph.cpp \
+  qml/models/moc_chainmodel.cpp \
+  qml/models/moc_networktraffictower.cpp \
+  qml/models/moc_nodemodel.cpp \
+  qml/models/moc_options_model.cpp \
+  qml/models/moc_peerlistsortproxy.cpp \
   qml/moc_appmode.cpp \
-  qml/moc_chainmodel.cpp \
-  qml/moc_networktraffictower.cpp \
-  qml/moc_nodemodel.cpp \
-  qml/moc_options_model.cpp \
-  qml/moc_peerlistsortproxy.cpp \
   qt/moc_addressbookpage.cpp \
   qt/moc_addresstablemodel.cpp \
   qt/moc_askpassphrasedialog.cpp \
@@ -114,16 +114,16 @@ QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
 QT_QRC_LOCALE = qt/bitcoin_locale.qrc
 
 BITCOIN_QT_H = \
-  qml/appmode.h \
-  qml/bitcoin.h \
-  qml/chainmodel.h \
   qml/components/blockclockdial.h \
   qml/controls/linegraph.h \
+  qml/models/chainmodel.h \
+  qml/models/networktraffictower.h \
+  qml/models/nodemodel.h \
+  qml/models/options_model.h \
+  qml/models/peerlistsortproxy.h \
+  qml/appmode.h \
+  qml/bitcoin.h \
   qml/imageprovider.h \
-  qml/networktraffictower.h \
-  qml/nodemodel.h \
-  qml/options_model.h \
-  qml/peerlistsortproxy.h \
   qml/util.h \
   qt/addressbookpage.h \
   qt/addresstablemodel.h \
@@ -301,14 +301,14 @@ BITCOIN_QT_WALLET_CPP = \
 
 BITCOIN_QML_BASE_CPP = \
   qml/bitcoin.cpp \
-  qml/chainmodel.cpp \
   qml/components/blockclockdial.cpp \
   qml/controls/linegraph.cpp \
+  qml/models/chainmodel.cpp \
+  qml/models/networktraffictower.cpp \
+  qml/models/nodemodel.cpp \
+  qml/models/options_model.cpp \
+  qml/models/peerlistsortproxy.cpp \
   qml/imageprovider.cpp \
-  qml/networktraffictower.cpp \
-  qml/nodemodel.cpp \
-  qml/options_model.cpp \
-  qml/peerlistsortproxy.cpp \
   qml/util.cpp
 
 QML_RES_FONTS = \

src/qml/bitcoin.cpp

@@ -13,14 +13,14 @@
 #include <node/interface_ui.h>
 #include <noui.h>
 #include <qml/appmode.h>
-#include <qml/chainmodel.h>
 #include <qml/components/blockclockdial.h>
 #include <qml/controls/linegraph.h>
-#include <qml/networktraffictower.h>
+#include <qml/models/chainmodel.h>
+#include <qml/models/networktraffictower.h>
+#include <qml/models/nodemodel.h>
+#include <qml/models/options_model.h>
+#include <qml/models/peerlistsortproxy.h>
 #include <qml/imageprovider.h>
-#include <qml/nodemodel.h>
-#include <qml/options_model.h>
-#include <qml/peerlistsortproxy.h>
 #include <qml/util.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>

src/qml/chainmodel.cpp renamed to src/qml/models/chainmodel.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 <qml/chainmodel.h>
+#include <qml/models/chainmodel.h>
 
 #include <QDateTime>
 #include <QString>

src/qml/chainmodel.h renamed to src/qml/models/chainmodel.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_QML_CHAINMODEL_H
-#define BITCOIN_QML_CHAINMODEL_H
+#ifndef BITCOIN_QML_MODELS_CHAINMODEL_H
+#define BITCOIN_QML_MODELS_CHAINMODEL_H
 
 #include <chainparams.h>
 #include <interfaces/chain.h>
@@ -64,4 +64,4 @@ public Q_SLOTS:
     interfaces::Chain& m_chain;
 };
 
-#endif // BITCOIN_QML_CHAINMODEL_H
+#endif // BITCOIN_QML_MODELS_CHAINMODEL_H

src/qml/networktraffictower.cpp renamed to src/qml/models/networktraffictower.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 <qml/networktraffictower.h>
+#include <qml/models/networktraffictower.h>
 
 #include <QObject>
 #include <QThread>

src/qml/networktraffictower.h renamed to src/qml/models/networktraffictower.h

@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_QML_NETWORKTRAFFICTOWER_H
-#define BITCOIN_QML_NETWORKTRAFFICTOWER_H
+#ifndef BITCOIN_QML_MODELS_NETWORKTRAFFICTOWER_H
+#define BITCOIN_QML_MODELS_NETWORKTRAFFICTOWER_H
 
-#include <qml/nodemodel.h>
+#include <qml/models/nodemodel.h>
 
 #include <QObject>
 #include <QQueue>
@@ -64,4 +64,4 @@ public Q_SLOTS:
     QQueue<float> m_smoothed_sent_rate_list;
 };
 
-#endif // BITCOIN_QML_NETWORKTRAFFICTOWER_H
+#endif // BITCOIN_QML_MODELS_NETWORKTRAFFICTOWER_H

src/qml/nodemodel.cpp renamed to src/qml/models/nodemodel.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 <qml/nodemodel.h>
+#include <qml/models/nodemodel.h>
 
 #include <interfaces/node.h>
 #include <net.h>

src/qml/nodemodel.h renamed to src/qml/models/nodemodel.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_QML_NODEMODEL_H
-#define BITCOIN_QML_NODEMODEL_H
+#ifndef BITCOIN_QML_MODELS_NODEMODEL_H
+#define BITCOIN_QML_MODELS_NODEMODEL_H
 
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
@@ -98,4 +98,4 @@ public Q_SLOTS:
     void ConnectToNumConnectionsChangedSignal();
 };
 
-#endif // BITCOIN_QML_NODEMODEL_H
+#endif // BITCOIN_QML_MODELS_NODEMODEL_H

src/qml/options_model.cpp renamed to src/qml/models/options_model.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 <qml/options_model.h>
+#include <qml/models/options_model.h>
 
 #include <interfaces/node.h>
 #include <qt/guiconstants.h>