Refine BalancesDialog includes

- add destructor - remove unused members - remove unused headers - forward declare classes - sort headers - ...
OmniLayer · May 18, 2015 · 825f512 · 825f512
1 parent 72d6e30
commit 825f512
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 92 deletions.
diff --git a/src/qt/balancesdialog.cpp b/src/qt/balancesdialog.cpp
@@ -3,79 +3,36 @@
 #include "balancesdialog.h"
 #include "ui_balancesdialog.h"
 
-#include "addresstablemodel.h"
-#include "bitcoinunits.h"
 #include "clientmodel.h"
-#include "csvmodelwriter.h"
-#include "editaddressdialog.h"
-#include "guiutil.h"
-#include "optionsmodel.h"
-#include "transactiondescdialog.h"
-#include "transactionfilterproxy.h"
-#include "transactionrecord.h"
-#include "transactiontablemodel.h"
 #include "walletmodel.h"
-#include "wallet.h"
-
-#include "ui_interface.h"
-
-#include <boost/filesystem.hpp>
-
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
-
-// potentially overzealous includes here
-#include "base58.h"
-#include "rpcserver.h"
-#include "init.h"
-#include "util.h"
-#include <fstream>
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <string>
-#include <boost/assign/list_of.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/find.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/format.hpp>
-#include <boost/filesystem.hpp>
-#include "json/json_spirit_utils.h"
-#include "json/json_spirit_value.h"
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
-// end potentially overzealous includes
-using namespace json_spirit; // since now using Array in mastercore.h this needs to come first
+#include "guiutil.h"
 
 #include "mastercore.h"
-using namespace mastercore;
 
-// potentially overzealous using here
-using namespace std;
-using namespace boost;
-using namespace boost::assign;
-using namespace leveldb;
-// end potentially overzealous using
+#include "amount.h"
+#include "sync.h"
+#include "ui_interface.h"
 
-#include "mastercore_dex.h"
-#include "mastercore_tx.h"
-#include "mastercore_sp.h"
+#include <stdint.h>
+#include <map>
+#include <sstream>
+#include <string>
 
-#include <QComboBox>
-#include <QDateTimeEdit>
-#include <QDesktopServices>
-#include <QDoubleValidator>
-#include <QHBoxLayout>
+#include <QAbstractItemView>
+#include <QAction>
+#include <QDialog>
 #include <QHeaderView>
-#include <QLabel>
-#include <QLineEdit>
 #include <QMenu>
+#include <QModelIndex>
 #include <QPoint>
-#include <QScrollBar>
-#include <QTableView>
-#include <QUrl>
-#include <QVBoxLayout>
+#include <QResizeEvent>
+#include <QString>
+#include <QTableWidgetItem>
+#include <QWidget>
+
+using std::ostringstream;
+using std::string;
+using namespace mastercore;
 
 BalancesDialog::BalancesDialog(QWidget *parent) :
     QDialog(parent), ui(new Ui::balancesDialog), clientModel(0), walletModel(0)
@@ -150,6 +107,11 @@ BalancesDialog::BalancesDialog(QWidget *parent) :
     connect(balancesCopyAvailableAmountAction, SIGNAL(triggered()), this, SLOT(balancesCopyCol3()));
 }
 
+BalancesDialog::~BalancesDialog()
+{
+    delete ui;
+}
+
 void BalancesDialog::setClientModel(ClientModel *model)
 {
     this->clientModel = model;
@@ -199,7 +161,7 @@ void BalancesDialog::UpdatePropSelector()
     if (propIdx != -1) { ui->propSelectorWidget->setCurrentIndex(propIdx); }
 }
 
-void BalancesDialog::AddRow(string label, string address, string reserved, string available)
+void BalancesDialog::AddRow(const std::string& label, const std::string& address, const std::string& reserved, const std::string& available)
 {
     int workingRow = ui->balancesTable->rowCount();
     ui->balancesTable->insertRow(workingRow);
@@ -262,7 +224,7 @@ void BalancesDialog::PopulateBalances(unsigned int propertyId)
         ui->balancesTable->setHorizontalHeaderItem(0, new QTableWidgetItem("Label"));
         ui->balancesTable->setHorizontalHeaderItem(1, new QTableWidgetItem("Address"));
         LOCK(cs_tally);
-        for(map<string, CMPTally>::iterator my_it = mp_tally_map.begin(); my_it != mp_tally_map.end(); ++my_it)
+        for(std::map<string, CMPTally>::iterator my_it = mp_tally_map.begin(); my_it != mp_tally_map.end(); ++my_it)
         {
             string address = (my_it->first).c_str();
             unsigned int id;

diff --git a/src/qt/balancesdialog.h b/src/qt/balancesdialog.h
@@ -7,25 +7,17 @@
 
 #include "guiutil.h"
 
-#include <QWidget>
 #include <QDialog>
-#include <QObject>
-#include <QString>
-#include <QTableWidget>
-#include <QTextEdit>
-#include <QDialogButtonBox>
 
 class ClientModel;
 class WalletModel;
 
 QT_BEGIN_NAMESPACE
-/*class QComboBox;
-class QFrame;
-class QLineEdit;
 class QMenu;
-class QModelIndex;
-class QSignalMapper;
-class QTableView;*/
+class QPoint;
+class QResizeEvent;
+class QString;
+class QWidget;
 QT_END_NAMESPACE
 
 namespace Ui {
@@ -38,18 +30,14 @@ class BalancesDialog : public QDialog
 
 public:
     explicit BalancesDialog(QWidget *parent = 0);
+    ~BalancesDialog();
+
     void setClientModel(ClientModel *model);
     void setWalletModel(WalletModel *model);
-    void AddRow(std::string label, std::string address, std::string reserved, std::string available);
+    void AddRow(const std::string& label, const std::string& address, const std::string& reserved, const std::string& available);
     void PopulateBalances(unsigned int propertyId);
-    void RefreshBalances();
     void UpdatePropSelector();
 
-    QTableWidgetItem *labelCell;
-    QTableWidgetItem *addressCell;
-    QTableWidgetItem *reservedCell;
-    QTableWidgetItem *availableCell;
-
 private:
     Ui::balancesDialog *ui;
     ClientModel *clientModel;
@@ -58,24 +46,22 @@ class BalancesDialog : public QDialog
     QMenu *contextMenuSummary;
 
     GUIUtil::TableViewLastColumnResizingFixer *borrowedColumnResizingFixer;
-    virtual void resizeEvent(QResizeEvent* event);
+    virtual void resizeEvent(QResizeEvent *event);
+
+public slots:
+    void propSelectorChanged();
+    void balancesUpdated();
 
 private slots:
-    void contextualMenu(const QPoint &);
+    void contextualMenu(const QPoint &point);
     void balancesCopyCol0();
     void balancesCopyCol1();
     void balancesCopyCol2();
     void balancesCopyCol3();
 
 signals:
-    void doubleClicked(const QModelIndex&);
-
     /**  Fired when a message should be reported to the user */
     void message(const QString &title, const QString &message, unsigned int style);
-
-public slots:
-    void propSelectorChanged();
-    void balancesUpdated();
 };
 
 #endif // BALANCESDIALOG_H