Merge pull request #68 from dexX7/oc-0.10-ui-uninitialized-variables

Update and remove overzealous includes
OmniLayer · May 19, 2015 · 644fe91 · 644fe91
2 parents 406f103 + c0d7654
commit 644fe91
Show file tree

Hide file tree

Showing 24 changed files with 440 additions and 802 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -152,11 +152,9 @@ QT_MOC_CPP = \
   qt/moc_lookuptxdialog.cpp \
   qt/moc_txhistorydialog.cpp \
   qt/moc_balancesdialog.cpp \
-  qt/moc_omnicore_init.cpp \
   qt/moc_metadexdialog.cpp \
   qt/moc_metadexcanceldialog.cpp \
-  qt/moc_tradehistorydialog.cpp \
-  qt/moc_omnicore_qtutils.cpp
+  qt/moc_tradehistorydialog.cpp
 
 BITCOIN_MM = \
   qt/macdockiconhandler.mm \

diff --git a/src/omnicore_pending.cpp b/src/omnicore_pending.cpp
@@ -1,9 +1,15 @@
 #include "omnicore_pending.h"
+
 #include "mastercore.h"
+#include "mastercore_log.h"
+
+#include "uint256.h"
 
 #include "json/json_spirit_value.h"
 #include "json/json_spirit_writer_template.h"
 
+#include <string>
+
 using json_spirit::Object;
 using json_spirit::Pair;
 using json_spirit::Value;
@@ -14,7 +20,7 @@ using namespace mastercore;
 /**
  * Adds a transaction to the pending map using supplied parameters
  */
-void PendingAdd(const uint256 txid, const std::string& sendingAddress, const std::string& refAddress, uint16_t type, uint32_t propertyId, int64_t amount, uint32_t propertyIdDesired, int64_t amountDesired, int64_t action)
+void PendingAdd(const uint256& txid, const std::string& sendingAddress, const std::string& refAddress, uint16_t type, uint32_t propertyId, int64_t amount, uint32_t propertyIdDesired, int64_t amountDesired, int64_t action)
 {
     Object txobj;
     std::string amountStr, amountDStr;
@@ -64,7 +70,7 @@ void PendingAdd(const uint256 txid, const std::string& sendingAddress, const std
     }
     std::string txDesc = write_string(Value(txobj), false);
     CMPPending pending;
-    if (msc_debug_pending) file_log("%s(%s,%s,%s,%d,%u,%ld,%u,%ld,%d,%s)\n", __FUNCTION__, txid.GetHex().c_str(), sendingAddress.c_str(), refAddress.c_str(),
+    if (msc_debug_pending) file_log("%s(%s,%s,%s,%d,%u,%ld,%u,%ld,%d,%s)\n", __FUNCTION__, txid.GetHex(), sendingAddress, refAddress,
                                         type, propertyId, amount, propertyIdDesired, amountDesired, action, txDesc);
     if (update_tally_map(sendingAddress, propertyId, -amount, PENDING)) {
         pending.src = sendingAddress;
@@ -81,13 +87,13 @@ void PendingAdd(const uint256 txid, const std::string& sendingAddress, const std
  *
  * NOTE: this is currently called for every bitcoin transaction prior to running through the parser
  */
-void PendingDelete(const uint256 txid)
+void PendingDelete(const uint256& txid)
 {
     PendingMap::iterator it = my_pending.find(txid);
     if (it != my_pending.end()) {
         CMPPending *p_pending = &(it->second);
         int64_t src_amount = getMPbalance(p_pending->src, p_pending->prop, PENDING);
-        if (msc_debug_pending) file_log("%s(%s): amount=%ld\n", __FUNCTION__, txid.GetHex().c_str(), src_amount);
+        if (msc_debug_pending) file_log("%s(%s): amount=%d\n", __FUNCTION__, txid.GetHex(), src_amount);
         if (src_amount) update_tally_map(p_pending->src, p_pending->prop, p_pending->amount, PENDING);
         my_pending.erase(it);
     }

diff --git a/src/omnicore_pending.h b/src/omnicore_pending.h
@@ -1,13 +1,16 @@
 #ifndef OMNICORE_PENDING_H
 #define OMNICORE_PENDING_H
 
-#include "uint256.h"
+class uint256;
+
+#include <stdint.h>
+#include <string>
 
 /** Adds a transaction to the pending map using supplied parameters. */
-void PendingAdd(const uint256 txid, const std::string& sendingAddress, const std::string& refAddress, uint16_t type, uint32_t propertyId, int64_t amount, uint32_t propertyIdDesired = 0, int64_t amountDesired = 0, int64_t action = 0);
+void PendingAdd(const uint256& txid, const std::string& sendingAddress, const std::string& refAddress, uint16_t type, uint32_t propertyId, int64_t amount, uint32_t propertyIdDesired = 0, int64_t amountDesired = 0, int64_t action = 0);
 
 /** Deletes a transaction from the pending map and credits the amount back to the pending tally for the address. */
-void PendingDelete(const uint256 txid);
+void PendingDelete(const uint256& txid);
 
 #endif // OMNICORE_PENDING_H
 

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,18 +107,23 @@ BalancesDialog::BalancesDialog(QWidget *parent) :
     connect(balancesCopyAvailableAmountAction, SIGNAL(triggered()), this, SLOT(balancesCopyCol3()));
 }
 
+BalancesDialog::~BalancesDialog()
+{
+    delete ui;
+}
+
 void BalancesDialog::setClientModel(ClientModel *model)
 {
+    this->clientModel = model;
     if (model != NULL) {
-        this->clientModel = model;
         connect(model, SIGNAL(refreshOmniState()), this, SLOT(balancesUpdated()));
     }
 }
 
 void BalancesDialog::setWalletModel(WalletModel *model)
 {
+    this->walletModel = model;
     if (model != NULL) {
-        this->walletModel = model;
         connect(model, SIGNAL(balanceChanged(CAmount,CAmount,CAmount,CAmount,CAmount,CAmount)), this, SLOT(balancesUpdated()));
     }
 }
@@ -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