Move cpp files and use absolute imports

monero-project · Jul 5, 2019 · 580d864 · 580d864
1 parent 257fd4e
commit 580d864
Show file tree

Hide file tree

Showing 25 changed files with 73 additions and 63 deletions.
diff --git a/main.cpp b/main.cpp
@@ -39,40 +39,41 @@
 #include <QScreen>
 #include <QRegExp>
 #include <QThread>
-#include "clipboardAdapter.h"
+
-#include "filter.h"
-#include "oscursor.h"
-#include "oshelper.h"
-#include "WalletManager.h"
-#include "Wallet.h"
-#include "QRCodeImageProvider.h"
-#include "PendingTransaction.h"
-#include "UnsignedTransaction.h"
-#include "TranslationManager.h"
-#include "TransactionInfo.h"
-#include "TransactionHistory.h"
-#include "model/TransactionHistoryModel.h"
-#include "model/TransactionHistorySortFilterModel.h"
-#include "AddressBook.h"
-#include "model/AddressBookModel.h"
-#include "Subaddress.h"
-#include "model/SubaddressModel.h"
-#include "SubaddressAccount.h"
-#include "model/SubaddressAccountModel.h"
 #include "wallet/api/wallet2_api.h"
-#include "Logger.h"
+#include "src/libwalletqt/WalletManager.h"
-#include "MainApp.h"
+#include "src/libwalletqt/Wallet.h"
-#include "qt/ipc.h"
+#include "src/libwalletqt/QRCodeImageProvider.h"
-#include "qt/utils.h"
+#include "src/libwalletqt/PendingTransaction.h"
-#include "qt/mime.h"
+#include "src/libwalletqt/UnsignedTransaction.h"
+#include "src/libwalletqt/TransactionInfo.h"
+#include "src/libwalletqt/TransactionHistory.h"
+#include "src/libwalletqt/AddressBook.h"
+#include "src/libwalletqt/Subaddress.h"
+#include "src/libwalletqt/SubaddressAccount.h"
+#include "src/model/AddressBookModel.h"
+#include "src/model/SubaddressModel.h"
+#include "src/model/SubaddressAccountModel.h"
+#include "src/model/TransactionHistoryModel.h"
+#include "src/model/TransactionHistorySortFilterModel.h"
+#include "src/qt/clipboardAdapter.h"
+#include "src/qt/filter.h"
+#include "src/qt/oscursor.h"
+#include "src/qt/oshelper.h"
+#include "src/qt/TranslationManager.h"
+#include "src/qt/Logger.h"
+#include "src/qt/MainApp.h"
+#include "src/qt/ipc.h"
+#include "src/qt/utils.h"
+#include "src/qt/mime.h"
 #include "src/qt/TailsOS.h"
 #include "src/qt/KeysFiles.h"
 #include "src/qt/MoneroSettings.h"
-#include "qt/prices.h"
+#include "src/qt/prices.h"
 
 // IOS exclusions
 #ifndef Q_OS_IOS
-#include "daemon/DaemonManager.h"
+#include "src/daemon/DaemonManager.h"
 #endif
 
 #ifdef WITH_SCANNER

diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
@@ -30,14 +30,16 @@ QMAKE_DISTCLEAN += -r $$WALLET_ROOT
 
 INCLUDEPATH +=  $$WALLET_ROOT/include \
                 $$PWD/src/libwalletqt \
+								$$PWD/src/qt \
                 $$PWD/src/QR-Code-generator \
                 $$PWD/src \
                 $$WALLET_ROOT/src
 
 HEADERS += \
-    filter.h \
+    src/qt/filter.h \
-    clipboardAdapter.h \
+    src/qt/clipboardAdapter.h \
-    oscursor.h \
+    src/qt/oscursor.h \
+		src/qt/TranslationManager.h \
     src/libwalletqt/WalletManager.h \
     src/libwalletqt/Wallet.h \
     src/libwalletqt/PendingTransaction.h \
@@ -46,8 +48,8 @@ HEADERS += \
     src/libwalletqt/QRCodeImageProvider.h \
     src/libwalletqt/Transfer.h \
     src/NetworkType.h \
-    oshelper.h \
+    src/qt/oshelper.h \
-    TranslationManager.h \
+    src/qt/TranslationManager.h \
     src/model/TransactionHistoryModel.h \
     src/model/TransactionHistorySortFilterModel.h \
     src/QR-Code-generator/BitBuffer.hpp \
@@ -61,8 +63,8 @@ HEADERS += \
     src/libwalletqt/SubaddressAccount.h \
     src/zxcvbn-c/zxcvbn.h \
     src/libwalletqt/UnsignedTransaction.h \
-    Logger.h \
+    src/qt/Logger.h \
-    MainApp.h \
+    src/qt/MainApp.h \
     src/qt/FutureScheduler.h \
     src/qt/ipc.h \
     src/qt/mime.h \
@@ -73,17 +75,17 @@ HEADERS += \
     src/qt/TailsOS.h
 
 SOURCES += main.cpp \
-    filter.cpp \
+    src/qt/filter.cpp \
-    clipboardAdapter.cpp \
+    src/qt/clipboardAdapter.cpp \
-    oscursor.cpp \
+    src/qt/oscursor.cpp \
     src/libwalletqt/WalletManager.cpp \
     src/libwalletqt/Wallet.cpp \
     src/libwalletqt/PendingTransaction.cpp \
     src/libwalletqt/TransactionHistory.cpp \
     src/libwalletqt/TransactionInfo.cpp \
     src/libwalletqt/QRCodeImageProvider.cpp \
-    oshelper.cpp \
+    src/qt/oshelper.cpp \
-    TranslationManager.cpp \
+    src/qt/TranslationManager.cpp \
     src/model/TransactionHistoryModel.cpp \
     src/model/TransactionHistorySortFilterModel.cpp \
     src/QR-Code-generator/BitBuffer.cpp \
@@ -97,8 +99,8 @@ SOURCES += main.cpp \
     src/libwalletqt/SubaddressAccount.cpp \
     src/zxcvbn-c/zxcvbn.c \
     src/libwalletqt/UnsignedTransaction.cpp \
-    Logger.cpp \
+    src/qt/Logger.cpp \
-    MainApp.cpp \
+    src/qt/MainApp.cpp \
     src/qt/FutureScheduler.cpp \
     src/qt/ipc.cpp \
     src/qt/mime.cpp \

diff --git a/src/qt/FutureScheduler.cpp b/src/qt/FutureScheduler.cpp
@@ -1,4 +1,4 @@
-#include "FutureScheduler.h"
+#include "src/qt/FutureScheduler.h"
 
 FutureScheduler::FutureScheduler(QObject *parent)
     : QObject(parent), Alive(0), Stopping(false)

diff --git a/src/qt/KeysFiles.cpp b/src/qt/KeysFiles.cpp
@@ -36,11 +36,11 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QString>
+
 #include "src/libwalletqt/WalletManager.h"
 #include "src/NetworkType.h"
 #include "src/qt/utils.h"
-
+#include "src/qt/KeysFiles.h"
-#include "KeysFiles.h"
 
 
 WalletKeysFiles::WalletKeysFiles(const qint64 &modified, const qint64 &created, const QString &path, const quint8 &networkType, const QString &address)

diff --git a/src/qt/KeysFiles.h b/src/qt/KeysFiles.h
@@ -30,9 +30,10 @@
 #define KEYSFILES_H
 
 #include <qqmlcontext.h>
+#include <QtCore>
+
 #include "src/libwalletqt/WalletManager.h"
 #include "src/NetworkType.h"
-#include <QtCore>
 
 class WalletKeysFiles
 {

diff --git a/Logger.cpp → src/qt/Logger.cpp b/Logger.cpp → src/qt/Logger.cpp
@@ -33,7 +33,7 @@
 #include <QDir>
 #include <QDebug>
 
-#include "Logger.h"
+#include "src/qt/Logger.h"
 #include "src/qt/TailsOS.h"
 #include "wallet/api/wallet2_api.h"
 

diff --git a/Logger.h → src/qt/Logger.h b/Logger.h → src/qt/Logger.h
diff --git a/MainApp.cpp → src/qt/MainApp.cpp b/MainApp.cpp → src/qt/MainApp.cpp
@@ -26,9 +26,10 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "MainApp.h"
 #include <QCloseEvent>
 
+#include "src/qt/MainApp.h"
+
 bool MainApp::event (QEvent *event)
 {
     // Catch application exit event and signal to qml app to handle exit

diff --git a/MainApp.h → src/qt/MainApp.h b/MainApp.h → src/qt/MainApp.h
diff --git a/src/qt/TailsOS.cpp b/src/qt/TailsOS.cpp
@@ -3,8 +3,8 @@
 #include <QPixmap>
 #include <QTranslator>
 
-#include "TailsOS.h"
+#include "src/qt/TailsOS.h"
-#include "utils.h"
+#include "src/qt/utils.h"
 
 bool TailsOS::usePersistence = false;
 

diff --git a/TranslationManager.cpp → src/qt/TranslationManager.cpp b/TranslationManager.cpp → src/qt/TranslationManager.cpp
@@ -26,14 +26,14 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "TranslationManager.h"
-
 #include <QApplication>
 #include <QTranslator>
 #include <QDir>
 #include <QDebug>
 #include <QFileInfo>
 
+#include "src/qt/TranslationManager.h"
+
 
 TranslationManager * TranslationManager::m_instance = nullptr;
 

diff --git a/TranslationManager.h → src/qt/TranslationManager.h b/TranslationManager.h → src/qt/TranslationManager.h
diff --git a/clipboardAdapter.cpp → src/qt/clipboardAdapter.cpp b/clipboardAdapter.cpp → src/qt/clipboardAdapter.cpp
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "clipboardAdapter.h"
+#include "src/qt/clipboardAdapter.h"
 
 clipboardAdapter::clipboardAdapter(QObject *parent) :
     QObject(parent)

diff --git a/clipboardAdapter.h → src/qt/clipboardAdapter.h b/clipboardAdapter.h → src/qt/clipboardAdapter.h
diff --git a/filter.cpp → src/qt/filter.cpp b/filter.cpp → src/qt/filter.cpp
@@ -26,11 +26,12 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "filter.h"
 #include <QtGlobal>
 #include <QKeyEvent>
 #include <QDebug>
 
+#include "src/qt/filter.h"
+
 #ifdef QT_DEBUG
     #include "private/qabstractanimation_p.h"
 #endif

diff --git a/filter.h → src/qt/filter.h b/filter.h → src/qt/filter.h
diff --git a/src/qt/ipc.cpp b/src/qt/ipc.cpp
@@ -32,8 +32,8 @@
 #include <QtNetwork>
 #include <QDebug>
 
-#include "ipc.h"
+#include "src/qt/ipc.h"
-#include "utils.h"
+#include "src/qt/utils.h"
 
 // Start listening for incoming IPC commands on UDS (Unix) or named pipe (Windows)
 void IPC::bind(){

diff --git a/src/qt/ipc.h b/src/qt/ipc.h
@@ -31,7 +31,8 @@
 
 #include <QtCore>
 #include <QLocalServer>
-#include <qt/utils.h>
+
+#include <src/qt/utils.h>
 
 class IPC : public QObject
 {

diff --git a/src/qt/mime.cpp b/src/qt/mime.cpp
@@ -31,8 +31,8 @@
 #include <QFile>
 #include <QTextStream>
 
-#include "mime.h"
+#include "src/qt/mime.h"
-#include "utils.h"
+#include "src/qt/utils.h"
 
 void registerXdgMime(QApplication &app){
     // MacOS handled via Info.plist

diff --git a/oscursor.cpp → src/qt/oscursor.cpp b/oscursor.cpp → src/qt/oscursor.cpp
@@ -26,8 +26,10 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "oscursor.h"
 #include <QCursor>
+
+#include "src/qt/oscursor.h"
+
 OSCursor::OSCursor(QObject *parent)
     : QObject(parent)
 {

diff --git a/oscursor.h → src/qt/oscursor.h b/oscursor.h → src/qt/oscursor.h
diff --git a/oshelper.cpp → src/qt/oshelper.cpp b/oshelper.cpp → src/qt/oshelper.cpp
@@ -26,12 +26,13 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "oshelper.h"
 #include <QTemporaryFile>
 #include <QDir>
 #include <QDebug>
 #include <QString>
 
+#include "src/qt/oshelper.h"
+
 OSHelper::OSHelper(QObject *parent) : QObject(parent)
 {
 

diff --git a/oshelper.h → src/qt/oshelper.h b/oshelper.h → src/qt/oshelper.h
diff --git a/src/qt/prices.cpp b/src/qt/prices.cpp
@@ -29,8 +29,8 @@
 #include <QtCore>
 #include <QNetworkAccessManager>
 
-#include "utils.h"
+#include "src/qt/utils.h"
-#include "prices.h"
+#include "src/qt/prices.h"
 
 
 Prices::Prices(QNetworkAccessManager *networkAccessManager, QObject *parent)

diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
@@ -28,7 +28,7 @@
 
 #include <QtCore>
 
-#include "utils.h"
+#include "src/qt/utils.h"
 
 bool fileExists(QString path) {
     QFileInfo check_file(path);