Skip to content
Permalink
Browse files

Move cpp files and use absolute imports

  • Loading branch information...
xmrdsc committed Jul 5, 2019
1 parent 257fd4e commit 580d864e561cea7c0b4299902957b9e88f0c119b
@@ -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 "MainApp.h"
#include "qt/ipc.h"
#include "qt/utils.h"
#include "qt/mime.h"
#include "src/libwalletqt/WalletManager.h"
#include "src/libwalletqt/Wallet.h"
#include "src/libwalletqt/QRCodeImageProvider.h"
#include "src/libwalletqt/PendingTransaction.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
@@ -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 \
clipboardAdapter.h \
oscursor.h \
src/qt/filter.h \
src/qt/clipboardAdapter.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 \
TranslationManager.h \
src/qt/oshelper.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 \
MainApp.h \
src/qt/Logger.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 \
clipboardAdapter.cpp \
oscursor.cpp \
src/qt/filter.cpp \
src/qt/clipboardAdapter.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 \
TranslationManager.cpp \
src/qt/oshelper.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 \
MainApp.cpp \
src/qt/Logger.cpp \
src/qt/MainApp.cpp \
src/qt/FutureScheduler.cpp \
src/qt/ipc.cpp \
src/qt/mime.cpp \
@@ -1,4 +1,4 @@
#include "FutureScheduler.h"
#include "src/qt/FutureScheduler.h"

FutureScheduler::FutureScheduler(QObject *parent)
: QObject(parent), Alive(0), Stopping(false)
@@ -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 "KeysFiles.h"
#include "src/qt/KeysFiles.h"


WalletKeysFiles::WalletKeysFiles(const qint64 &modified, const qint64 &created, const QString &path, const quint8 &networkType, const QString &address)
@@ -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
{
@@ -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"

File renamed without changes.
@@ -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
File renamed without changes.
@@ -3,8 +3,8 @@
#include <QPixmap>
#include <QTranslator>

#include "TailsOS.h"
#include "utils.h"
#include "src/qt/TailsOS.h"
#include "src/qt/utils.h"

bool TailsOS::usePersistence = false;

@@ -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;

File renamed without changes.
@@ -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)
File renamed without changes.
@@ -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
File renamed without changes.
@@ -32,8 +32,8 @@
#include <QtNetwork>
#include <QDebug>

#include "ipc.h"
#include "utils.h"
#include "src/qt/ipc.h"
#include "src/qt/utils.h"

// Start listening for incoming IPC commands on UDS (Unix) or named pipe (Windows)
void IPC::bind(){
@@ -31,7 +31,8 @@

#include <QtCore>
#include <QLocalServer>
#include <qt/utils.h>

#include <src/qt/utils.h>

class IPC : public QObject
{
@@ -31,8 +31,8 @@
#include <QFile>
#include <QTextStream>

#include "mime.h"
#include "utils.h"
#include "src/qt/mime.h"
#include "src/qt/utils.h"

void registerXdgMime(QApplication &app){
// MacOS handled via Info.plist
@@ -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)
{
File renamed without changes.
@@ -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)
{

File renamed without changes.
@@ -29,8 +29,8 @@
#include <QtCore>
#include <QNetworkAccessManager>

#include "utils.h"
#include "prices.h"
#include "src/qt/utils.h"
#include "src/qt/prices.h"


Prices::Prices(QNetworkAccessManager *networkAccessManager, QObject *parent)
@@ -28,7 +28,7 @@

#include <QtCore>

#include "utils.h"
#include "src/qt/utils.h"

bool fileExists(QString path) {
QFileInfo check_file(path);

0 comments on commit 580d864

Please sign in to comment.
You can’t perform that action at this time.