Merge pull request #4586

f65352a [Qt] small Qt-only include cleanup (Philip Kaufmann)

src/qt/optionsdialog.cpp

@@ -15,11 +15,11 @@
 #include "optionsmodel.h"
 
 #include "main.h" // for MAX_SCRIPTCHECK_THREADS
+#include "netbase.h"
+#include "txdb.h" // for -dbcache defaults
 #ifdef ENABLE_WALLET
 #include "wallet.h" // for CWallet::minTxFee
 #endif
-#include "netbase.h"
-#include "txdb.h" // for -dbcache defaults
 
 #include <QDir>
 #include <QIntValidator>

src/qt/transactiondesc.cpp

@@ -11,11 +11,11 @@
 #include "db.h"
 #include "main.h"
 #include "paymentserver.h"
+#include "script.h"
 #include "transactionrecord.h"
 #include "timedata.h"
 #include "ui_interface.h"
 #include "wallet.h"
-#include "script.h"
 
 #include <stdint.h>
 #include <string>

src/qt/transactiontablemodel.cpp

@@ -577,7 +577,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
     case ConfirmedRole:
         return rec->status.countsForBalance;
     case FormattedAmountRole:
-	// Used for copy/export, so don't include separators
+        // Used for copy/export, so don't include separators
         return formatTxAmount(rec, false, BitcoinUnits::separatorNever);
     case StatusRole:
         return rec->status.status;

src/qt/transactiontablemodel.h

@@ -5,11 +5,11 @@
 #ifndef TRANSACTIONTABLEMODEL_H
 #define TRANSACTIONTABLEMODEL_H
 
+#include "bitcoinunits.h"
+
 #include <QAbstractTableModel>
 #include <QStringList>
 
-#include "bitcoinunits.h"
-
 class TransactionRecord;
 class TransactionTablePriv;
 class WalletModel;