From 00d2c1b9530b4adb31bf6e71e7fb8a3cbf60566b Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 27 Jun 2021 16:43:14 +0200 Subject: [PATCH] Dialogs: clean up header files --- src/dialog/AboutDialog.cpp | 3 +-- src/dialog/PasswordChangeDialog.h | 6 +++--- src/dialog/SignVerifyDialog.h | 8 ++++---- src/dialog/TxBroadcastDialog.h | 1 - src/dialog/TxImportDialog.h | 1 - src/dialog/TxInfoDialog.h | 2 -- src/dialog/TxProofDialog.h | 6 +++--- src/dialog/ViewOnlyDialog.h | 3 ++- src/dialog/WalletCacheDebugDialog.h | 1 + 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp index 1a89478e..898c3532 100644 --- a/src/dialog/AboutDialog.cpp +++ b/src/dialog/AboutDialog.cpp @@ -39,5 +39,4 @@ AboutDialog::AboutDialog(QWidget *parent) this->adjustSize(); } -AboutDialog::~AboutDialog() = default; - +AboutDialog::~AboutDialog() = default; \ No newline at end of file diff --git a/src/dialog/PasswordChangeDialog.h b/src/dialog/PasswordChangeDialog.h index d0233666..7fc91e03 100644 --- a/src/dialog/PasswordChangeDialog.h +++ b/src/dialog/PasswordChangeDialog.h @@ -21,11 +21,11 @@ public: ~PasswordChangeDialog() override; private: - QScopedPointer ui; - Wallet *m_wallet; - void passwordsMatch(); void setPassword(); + + QScopedPointer ui; + Wallet *m_wallet; }; #endif //FEATHER_PASSWORDCHANGEDIALOG_H diff --git a/src/dialog/SignVerifyDialog.h b/src/dialog/SignVerifyDialog.h index 4ddd8d84..d7819f61 100644 --- a/src/dialog/SignVerifyDialog.h +++ b/src/dialog/SignVerifyDialog.h @@ -20,14 +20,14 @@ public: explicit SignVerifyDialog(Wallet *wallet, QWidget *parent = nullptr); ~SignVerifyDialog() override; -private: - QScopedPointer ui; - Wallet *m_wallet; - private slots: void signMessage(); void verifyMessage(); void copyToClipboard(); + +private: + QScopedPointer ui; + Wallet *m_wallet; }; diff --git a/src/dialog/TxBroadcastDialog.h b/src/dialog/TxBroadcastDialog.h index a1db2c3b..944d463d 100644 --- a/src/dialog/TxBroadcastDialog.h +++ b/src/dialog/TxBroadcastDialog.h @@ -28,7 +28,6 @@ private slots: private: QScopedPointer ui; QSharedPointer m_ctx; - UtilsNetworking *m_network; DaemonRpc *m_rpc; }; diff --git a/src/dialog/TxImportDialog.h b/src/dialog/TxImportDialog.h index e09786cb..49192527 100644 --- a/src/dialog/TxImportDialog.h +++ b/src/dialog/TxImportDialog.h @@ -30,7 +30,6 @@ private: QScopedPointer ui; QSharedPointer m_ctx; - UtilsNetworking *m_network; DaemonRpc *m_rpc; QTimer *m_loadTimer; diff --git a/src/dialog/TxInfoDialog.h b/src/dialog/TxInfoDialog.h index d9b3aabe..9a5bea64 100644 --- a/src/dialog/TxInfoDialog.h +++ b/src/dialog/TxInfoDialog.h @@ -33,13 +33,11 @@ private: void updateData(); QScopedPointer ui; - QSharedPointer m_ctx; TransactionInfo *m_txInfo; TxProofDialog *m_txProofDialog; QString m_txKey; QString m_txid; - QTimer m_updateTimer; }; #endif //FEATHER_TXINFODIALOG_H diff --git a/src/dialog/TxProofDialog.h b/src/dialog/TxProofDialog.h index 4d6f3593..9de0ec33 100644 --- a/src/dialog/TxProofDialog.h +++ b/src/dialog/TxProofDialog.h @@ -42,15 +42,15 @@ private: void toggleButtons(bool enabled); void showWarning(const QString &message); + QScopedPointer ui; + QSharedPointer m_ctx; + QStringList m_OutDestinations; QStringList m_InDestinations; QString m_txid; QString m_txKey; Mode m_mode; TransactionInfo::Direction m_direction; - - QScopedPointer ui; - QSharedPointer m_ctx; }; #endif //FEATHER_TXPROOFDIALOG_H diff --git a/src/dialog/ViewOnlyDialog.h b/src/dialog/ViewOnlyDialog.h index 2841062c..3cb99429 100644 --- a/src/dialog/ViewOnlyDialog.h +++ b/src/dialog/ViewOnlyDialog.h @@ -24,9 +24,10 @@ private slots: void onWriteViewOnlyWallet(); private: + void copyToClipboad(); + QScopedPointer ui; QSharedPointer m_ctx; - void copyToClipboad(); }; diff --git a/src/dialog/WalletCacheDebugDialog.h b/src/dialog/WalletCacheDebugDialog.h index 84363487..0b8f0768 100644 --- a/src/dialog/WalletCacheDebugDialog.h +++ b/src/dialog/WalletCacheDebugDialog.h @@ -22,6 +22,7 @@ public: private: void setOutput(const QString &output); + QScopedPointer ui; QSharedPointer m_ctx; };