Browse Source

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.
0.16
Wladimir J. van der Laan 7 years ago committed by MeshCollider
parent
commit
e7b31631c7
  1. 2
      src/qt/addressbookpage.cpp
  2. 2
      src/qt/askpassphrasedialog.cpp
  3. 2
      src/qt/bitcoin.cpp
  4. 2
      src/qt/bitcoinamountfield.cpp
  5. 2
      src/qt/coincontroldialog.cpp
  6. 2
      src/qt/editaddressdialog.cpp
  7. 4
      src/qt/intro.cpp
  8. 2
      src/qt/modaloverlay.cpp
  9. 2
      src/qt/openuridialog.cpp
  10. 2
      src/qt/optionsdialog.cpp
  11. 2
      src/qt/optionsmodel.cpp
  12. 4
      src/qt/overviewpage.cpp
  13. 2
      src/qt/paymentrequestplus.h
  14. 2
      src/qt/receivecoinsdialog.cpp
  15. 2
      src/qt/receiverequestdialog.cpp
  16. 4
      src/qt/rpcconsole.cpp
  17. 2
      src/qt/sendcoinsdialog.cpp
  18. 2
      src/qt/sendcoinsentry.cpp
  19. 2
      src/qt/signverifymessagedialog.cpp
  20. 2
      src/qt/test/compattests.cpp
  21. 2
      src/qt/test/paymentservertests.cpp
  22. 2
      src/qt/test/paymentservertests.h
  23. 2
      src/qt/test/rpcnestedtests.cpp
  24. 4
      src/qt/test/uritests.cpp
  25. 2
      src/qt/transactiondescdialog.cpp
  26. 2
      src/qt/utilitydialog.cpp

2
src/qt/addressbookpage.cpp

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

2
src/qt/askpassphrasedialog.cpp

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

2
src/qt/bitcoin.cpp

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

2
src/qt/bitcoinamountfield.cpp

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

2
src/qt/coincontroldialog.cpp

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

2
src/qt/editaddressdialog.cpp

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

4
src/qt/intro.cpp

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

2
src/qt/modaloverlay.cpp

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

2
src/qt/openuridialog.cpp

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

2
src/qt/optionsdialog.cpp

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

2
src/qt/optionsmodel.cpp

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
#include <net.h>
#include <netbase.h>
#include <txdb.h> // for -dbcache defaults
#include <qt/intro.h>
#include <qt/intro.h>
#ifdef ENABLE_WALLET
#include <wallet/wallet.h>

4
src/qt/overviewpage.cpp

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

2
src/qt/paymentrequestplus.h

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

2
src/qt/receivecoinsdialog.cpp

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

2
src/qt/receiverequestdialog.cpp

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

4
src/qt/rpcconsole.cpp

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
#endif
#include <qt/rpcconsole.h>
#include <ui_debugwindow.h>
#include <qt/forms/ui_debugwindow.h>
#include <qt/bantablemodel.h>
#include <qt/clientmodel.h>
@ -125,7 +125,7 @@ public: @@ -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).

2
src/qt/sendcoinsdialog.cpp

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

2
src/qt/sendcoinsentry.cpp

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

2
src/qt/signverifymessagedialog.cpp

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

2
src/qt/test/compattests.cpp

@ -2,7 +2,7 @@ @@ -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 <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>

2
src/qt/test/paymentservertests.cpp

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

2
src/qt/test/paymentservertests.h

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

2
src/qt/test/rpcnestedtests.cpp

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

4
src/qt/test/uritests.cpp

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

2
src/qt/transactiondescdialog.cpp

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

2
src/qt/utilitydialog.cpp

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

Loading…
Cancel
Save