diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qt/addressbookpage.cpp | 2 | ||||
-rw-r--r-- | src/qt/askpassphrasedialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
-rw-r--r-- | src/qt/bitcoinamountfield.cpp | 2 | ||||
-rw-r--r-- | src/qt/coincontroldialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/editaddressdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/intro.cpp | 4 | ||||
-rw-r--r-- | src/qt/modaloverlay.cpp | 2 | ||||
-rw-r--r-- | src/qt/openuridialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/optionsdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/optionsmodel.cpp | 2 | ||||
-rw-r--r-- | src/qt/overviewpage.cpp | 4 | ||||
-rw-r--r-- | src/qt/paymentrequestplus.h | 2 | ||||
-rw-r--r-- | src/qt/receivecoinsdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/receiverequestdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/rpcconsole.cpp | 4 | ||||
-rw-r--r-- | src/qt/sendcoinsdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/sendcoinsentry.cpp | 2 | ||||
-rw-r--r-- | src/qt/signverifymessagedialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/compattests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/paymentservertests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/paymentservertests.h | 2 | ||||
-rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/uritests.cpp | 4 | ||||
-rw-r--r-- | src/qt/transactiondescdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/utilitydialog.cpp | 2 |
26 files changed, 30 insertions, 30 deletions
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 905ea87756..dda8dce391 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -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> diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index b45f97dace..a720ac956b 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -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> diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 57ea5fe549..557d7efcec 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -261,7 +261,7 @@ private: void startThread(); }; -#include <bitcoin.moc> +#include <qt/bitcoin.moc> BitcoinCore::BitcoinCore(): QObject() diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 2ad99b3aab..0b21349c54 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -188,7 +188,7 @@ Q_SIGNALS: void valueChanged(); }; -#include <bitcoinamountfield.moc> +#include <qt/bitcoinamountfield.moc> BitcoinAmountField::BitcoinAmountField(QWidget *parent) : QWidget(parent), diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 7dfc38673e..03e633e375 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -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> diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index fed3431887..0437f81a7e 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -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> diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 8f8e93402b..9e4c765101 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -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: Intro *intro; }; -#include <intro.moc> +#include <qt/intro.moc> FreespaceChecker::FreespaceChecker(Intro *_intro) { diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index bb0090a738..b707b0dda9 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -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> diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index d3ae16fc58..40671922f4 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -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> diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 095f25b372..d7aa8bc38b 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -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> diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 6fcd6c2950..a0645d9a74 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -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> diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 880c51ce12..7818607d30 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -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: const PlatformStyle *platformStyle; }; -#include <overviewpage.moc> +#include <qt/overviewpage.moc> OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) : QWidget(parent), diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index f8a6a5168e..e1388f2b5d 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -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> diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 7831d4191a..d6e2beb312 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -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> diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 1c17075290..c69fea1c93 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -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> diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 3d6f673c7d..6687d62baa 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -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: }; -#include <rpcconsole.moc> +#include <qt/rpcconsole.moc> /** * Split shell command line into a list of arguments and optionally execute the command(s). diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index da84a5fa2a..036b6ebcc0 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -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> diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index aad5665230..20e39bdeba 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -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> diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 0030fce026..4cd0c76b16 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -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> diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index c22e1973a6..7a4388e940 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.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 <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> diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 7aaaccaa9e..1864604372 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -4,7 +4,7 @@ #include <qt/test/paymentservertests.h> -#include <optionsmodel.h> +#include <qt/optionsmodel.h> #include <qt/test/paymentrequestdata.h> #include <amount.h> diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index f1dbeae366..6d84c38287 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -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> diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 2f692af2d2..0596ccf90e 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -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> diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index e11807d551..e47aa8b546 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -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> diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp index 44bd19f9f5..74d7a8f525 100644 --- a/src/qt/transactiondescdialog.cpp +++ b/src/qt/transactiondescdialog.cpp @@ -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> diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 2a19a0afe5..6d5a2f3101 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -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> |