qt: refactor: Changes to make include paths absolute

This makes all include paths in the GUI absolute.

Many changes are involved as every single source file in
src/qt/ assumes to be able to use relative includes.
This commit is contained in:
Wladimir J. van der Laan 2017-08-15 17:31:26 +02:00 committed by MeshCollider
parent 0c715214dd
commit e7b31631c7
26 changed files with 30 additions and 30 deletions

View File

@ -7,7 +7,7 @@
#endif #endif
#include <qt/addressbookpage.h> #include <qt/addressbookpage.h>
#include <ui_addressbookpage.h> #include <qt/forms/ui_addressbookpage.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>
#include <qt/bitcoingui.h> #include <qt/bitcoingui.h>

View File

@ -7,7 +7,7 @@
#endif #endif
#include <qt/askpassphrasedialog.h> #include <qt/askpassphrasedialog.h>
#include <ui_askpassphrasedialog.h> #include <qt/forms/ui_askpassphrasedialog.h>
#include <qt/guiconstants.h> #include <qt/guiconstants.h>
#include <qt/walletmodel.h> #include <qt/walletmodel.h>

View File

@ -261,7 +261,7 @@ private:
void startThread(); void startThread();
}; };
#include <bitcoin.moc> #include <qt/bitcoin.moc>
BitcoinCore::BitcoinCore(): BitcoinCore::BitcoinCore():
QObject() QObject()

View File

@ -188,7 +188,7 @@ Q_SIGNALS:
void valueChanged(); void valueChanged();
}; };
#include <bitcoinamountfield.moc> #include <qt/bitcoinamountfield.moc>
BitcoinAmountField::BitcoinAmountField(QWidget *parent) : BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
QWidget(parent), QWidget(parent),

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/coincontroldialog.h> #include <qt/coincontroldialog.h>
#include <ui_coincontroldialog.h> #include <qt/forms/ui_coincontroldialog.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/editaddressdialog.h> #include <qt/editaddressdialog.h>
#include <ui_editaddressdialog.h> #include <qt/forms/ui_editaddressdialog.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

View File

@ -8,7 +8,7 @@
#include <fs.h> #include <fs.h>
#include <qt/intro.h> #include <qt/intro.h>
#include <ui_intro.h> #include <qt/forms/ui_intro.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>
@ -60,7 +60,7 @@ private:
Intro *intro; Intro *intro;
}; };
#include <intro.moc> #include <qt/intro.moc>
FreespaceChecker::FreespaceChecker(Intro *_intro) FreespaceChecker::FreespaceChecker(Intro *_intro)
{ {

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/modaloverlay.h> #include <qt/modaloverlay.h>
#include <ui_modaloverlay.h> #include <qt/forms/ui_modaloverlay.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/openuridialog.h> #include <qt/openuridialog.h>
#include <ui_openuridialog.h> #include <qt/forms/ui_openuridialog.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>
#include <qt/walletmodel.h> #include <qt/walletmodel.h>

View File

@ -7,7 +7,7 @@
#endif #endif
#include <qt/optionsdialog.h> #include <qt/optionsdialog.h>
#include <ui_optionsdialog.h> #include <qt/forms/ui_optionsdialog.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/overviewpage.h> #include <qt/overviewpage.h>
#include <ui_overviewpage.h> #include <qt/forms/ui_overviewpage.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>
@ -106,7 +106,7 @@ public:
const PlatformStyle *platformStyle; const PlatformStyle *platformStyle;
}; };
#include <overviewpage.moc> #include <qt/overviewpage.moc>
OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) : OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) :
QWidget(parent), QWidget(parent),

View File

@ -7,7 +7,7 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <paymentrequest.pb.h> #include <qt/paymentrequest.pb.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#include <base58.h> #include <base58.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/receivecoinsdialog.h> #include <qt/receivecoinsdialog.h>
#include <ui_receivecoinsdialog.h> #include <qt/forms/ui_receivecoinsdialog.h>
#include <qt/addressbookpage.h> #include <qt/addressbookpage.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/receiverequestdialog.h> #include <qt/receiverequestdialog.h>
#include <ui_receiverequestdialog.h> #include <qt/forms/ui_receiverequestdialog.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/guiconstants.h> #include <qt/guiconstants.h>

View File

@ -7,7 +7,7 @@
#endif #endif
#include <qt/rpcconsole.h> #include <qt/rpcconsole.h>
#include <ui_debugwindow.h> #include <qt/forms/ui_debugwindow.h>
#include <qt/bantablemodel.h> #include <qt/bantablemodel.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>
@ -125,7 +125,7 @@ public:
}; };
#include <rpcconsole.moc> #include <qt/rpcconsole.moc>
/** /**
* Split shell command line into a list of arguments and optionally execute the command(s). * Split shell command line into a list of arguments and optionally execute the command(s).

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/sendcoinsdialog.h> #include <qt/sendcoinsdialog.h>
#include <ui_sendcoinsdialog.h> #include <qt/forms/ui_sendcoinsdialog.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/sendcoinsentry.h> #include <qt/sendcoinsentry.h>
#include <ui_sendcoinsentry.h> #include <qt/forms/ui_sendcoinsentry.h>
#include <qt/addressbookpage.h> #include <qt/addressbookpage.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/signverifymessagedialog.h> #include <qt/signverifymessagedialog.h>
#include <ui_signverifymessagedialog.h> #include <qt/forms/ui_signverifymessagedialog.h>
#include <qt/addressbookpage.h> #include <qt/addressbookpage.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>

View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos #include <qt/paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos
#include <qt/test/compattests.h> #include <qt/test/compattests.h>

View File

@ -4,7 +4,7 @@
#include <qt/test/paymentservertests.h> #include <qt/test/paymentservertests.h>
#include <optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/test/paymentrequestdata.h> #include <qt/test/paymentrequestdata.h>
#include <amount.h> #include <amount.h>

View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H #ifndef BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H
#define BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H #define BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H
#include <qt/test/../paymentserver.h> #include <qt/paymentserver.h>
#include <QObject> #include <QObject>
#include <QTest> #include <QTest>

View File

@ -10,7 +10,7 @@
#include <validation.h> #include <validation.h>
#include <rpc/register.h> #include <rpc/register.h>
#include <rpc/server.h> #include <rpc/server.h>
#include <rpcconsole.h> #include <qt/rpcconsole.h>
#include <test/test_bitcoin.h> #include <test/test_bitcoin.h>
#include <univalue.h> #include <univalue.h>
#include <util.h> #include <util.h>

View File

@ -4,8 +4,8 @@
#include <qt/test/uritests.h> #include <qt/test/uritests.h>
#include <guiutil.h> #include <qt/guiutil.h>
#include <walletmodel.h> #include <qt/walletmodel.h>
#include <QUrl> #include <QUrl>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <qt/transactiondescdialog.h> #include <qt/transactiondescdialog.h>
#include <ui_transactiondescdialog.h> #include <qt/forms/ui_transactiondescdialog.h>
#include <qt/transactiontablemodel.h> #include <qt/transactiontablemodel.h>

View File

@ -8,7 +8,7 @@
#include <qt/utilitydialog.h> #include <qt/utilitydialog.h>
#include <ui_helpmessagedialog.h> #include <qt/forms/ui_helpmessagedialog.h>
#include <qt/bitcoingui.h> #include <qt/bitcoingui.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>