From 1d93d8ce1cea5dbb102e1e4c87a3027489335d03 Mon Sep 17 00:00:00 2001 From: arkpar Date: Tue, 16 Dec 2014 11:57:59 +0100 Subject: [PATCH] style --- mix/CodeEditorExtensionManager.cpp | 2 +- mix/TransactionListModel.cpp | 52 ++++++++++++++++-------------- mix/TransactionListModel.h | 33 ++++++++++--------- mix/TransactionListView.cpp | 22 ++++++------- mix/TransactionListView.h | 25 +++++++------- 5 files changed, 69 insertions(+), 65 deletions(-) diff --git a/mix/CodeEditorExtensionManager.cpp b/mix/CodeEditorExtensionManager.cpp index 70e3db95c..540893759 100644 --- a/mix/CodeEditorExtensionManager.cpp +++ b/mix/CodeEditorExtensionManager.cpp @@ -73,7 +73,7 @@ void CodeEditorExtensionManager::initExtensions() initExtension(std::make_shared(m_doc)); std::shared_ptr debug = std::make_shared(m_doc); std::shared_ptr tr = std::make_shared(m_doc); - QObject::connect(tr->model(), &TransactionListModel::transactionRan, debug.get(), &AssemblyDebuggerCtrl::runTransaction); + QObject::connect(tr->model(), &TransactionListModel::transactionStarted, debug.get(), &AssemblyDebuggerCtrl::runTransaction); initExtension(debug); initExtension(tr); } diff --git a/mix/TransactionListModel.cpp b/mix/TransactionListModel.cpp index 3a396aee4..44474a232 100644 --- a/mix/TransactionListModel.cpp +++ b/mix/TransactionListModel.cpp @@ -1,18 +1,18 @@ /* - This file is part of cpp-ethereum. + This file is part of cpp-ethereum. - cpp-ethereum is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - cpp-ethereum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with cpp-ethereum. If not, see . + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . */ /** @file TransactionListModel.cpp * @author Arkadiy Paronyan arkadiy@ethdev.com @@ -35,11 +35,13 @@ namespace dev namespace mix { +/// @todo Move this to QML u256 fromQString(QString const& _s) { return dev::jsToU256(_s.toStdString()); } +/// @todo Move this to QML QString toQString(u256 _value) { std::ostringstream s; @@ -72,10 +74,10 @@ int TransactionListModel::rowCount(QModelIndex const& _parent) const QVariant TransactionListModel::data(QModelIndex const& _index, int _role) const { - if(_index.row() < 0 || _index.row() >= (int)m_transactions.size()) + if (_index.row() < 0 || _index.row() >= (int)m_transactions.size()) return QVariant(); auto const& transaction = m_transactions.at(_index.row()); - switch(_role) + switch (_role) { case TitleRole: return QVariant(transaction.title); @@ -86,7 +88,7 @@ QVariant TransactionListModel::data(QModelIndex const& _index, int _role) const } } -//TODO: get parameters from code model +///@todo: get parameters from code model QList buildParameters(QTextDocument* _document, TransactionSettings const& _transaction, QString const& _functionId) { QList params; @@ -95,14 +97,14 @@ QList buildParameters(QTextDocument* _document, Trans QString code = _document->toPlainText().replace("\n", ""); //TODO: is this required? std::shared_ptr contract = QContractDefinition::Contract(code); auto functions = contract->functions(); - for(auto qf : functions) + for (auto qf : functions) { QFunctionDefinition const& f = (QFunctionDefinition const&) *qf; if (f.name() != _functionId) continue; auto parameters = f.parameters(); - for(auto qp : parameters) + for (auto qp : parameters) { QVariableDeclaration const& p = (QVariableDeclaration const&) *qp; QString paramValue; @@ -127,7 +129,7 @@ QList buildParameters(QTextDocument* _document, Trans return params; } -//TODO: get fnctions from code model +///@todo: get fnctions from code model QList TransactionListModel::getFunctions() { QList functionNames; @@ -136,9 +138,9 @@ QList TransactionListModel::getFunctions() QString code = m_document->toPlainText().replace("\n", ""); //TODO: is this required? std::shared_ptr contract(QContractDefinition::Contract(code)); auto functions = contract->functions(); - for(auto qf : functions) + for (auto qf : functions) { - QFunctionDefinition const& f = (QFunctionDefinition const&) *qf; + QFunctionDefinition const& f = (QFunctionDefinition const&) * qf; functionNames.append(f.name()); } } @@ -150,17 +152,17 @@ QList TransactionListModel::getFunctions() QVariantList TransactionListModel::getParameters(int _index, QString const& _functionId) { - TransactionSettings const& transaction = (_index >=0 && _index < (int)m_transactions.size()) ? m_transactions[_index] : TransactionSettings(); + TransactionSettings const& transaction = (_index >= 0 && _index < (int)m_transactions.size()) ? m_transactions[_index] : TransactionSettings(); auto plist = buildParameters(m_document, transaction, _functionId); QVariantList vl; - for(QObject* p : plist) + for (QObject* p : plist) vl.append(QVariant::fromValue(p)); return vl; } QObject* TransactionListModel::getItem(int _index) { - TransactionSettings const& transaction = (_index >=0 && _index < (int)m_transactions.size()) ? m_transactions[_index] : TransactionSettings(); + TransactionSettings const& transaction = (_index >= 0 && _index < (int)m_transactions.size()) ? m_transactions[_index] : TransactionSettings(); TransactionListItem* item = new TransactionListItem(_index, transaction, nullptr); QQmlEngine::setObjectOwnership(item, QQmlEngine::JavaScriptOwnership); return item; @@ -169,6 +171,7 @@ QObject* TransactionListModel::getItem(int _index) void TransactionListModel::edit(QObject* _data) { //these properties come from TransactionDialog QML object + ///@todo change the model to a qml component int index = _data->property("transactionIndex").toInt(); QString title = _data->property("transactionTitle").toString(); QString gas = _data->property("gas").toString(); @@ -178,7 +181,7 @@ void TransactionListModel::edit(QObject* _data) QAbstractListModel* paramsModel = qvariant_cast(_data->property("transactionParams")); TransactionSettings transaction(title, functionId, fromQString(value), fromQString(gas), fromQString(gasPrice)); int paramCount = paramsModel->rowCount(QModelIndex()); - for(int p = 0; p < paramCount; ++p) + for (int p = 0; p < paramCount; ++p) { QString paramName = paramsModel->data(paramsModel->index(p, 0), Qt::DisplayRole).toString(); QString paramValue = paramsModel->data(paramsModel->index(p, 0), Qt::DisplayRole + 2).toString(); @@ -197,7 +200,6 @@ void TransactionListModel::edit(QObject* _data) beginInsertRows(QModelIndex(), index, index); m_transactions.push_back(transaction); - emit transactionAdded(); emit countChanged(); endInsertRows(); } @@ -210,7 +212,7 @@ int TransactionListModel::getCount() const void TransactionListModel::runTransaction(int _index) { TransactionSettings tr = m_transactions.at(_index); - emit transactionRan(tr); + emit transactionStarted(tr); } } diff --git a/mix/TransactionListModel.h b/mix/TransactionListModel.h index e891b7975..28800a4ff 100644 --- a/mix/TransactionListModel.h +++ b/mix/TransactionListModel.h @@ -1,18 +1,18 @@ /* - This file is part of cpp-ethereum. + This file is part of cpp-ethereum. - cpp-ethereum is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - cpp-ethereum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with cpp-ethereum. If not, see . + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . */ /** @file TransactionListView.h * @author Arkadiy Paronyan arkadiy@ethdev.com @@ -28,6 +28,7 @@ #include #include #include +#include class QTextDocument; @@ -40,7 +41,7 @@ namespace mix struct TransactionSettings { TransactionSettings(): - value(0), gas(10000), gasPrice(10) {} + value(0), gas(10000), gasPrice(10 * dev::eth::szabo) {} TransactionSettings(QString const& _title, QString const& _functionId, u256 _value, u256 _gas, u256 _gasPrice): title(_title), functionId(_functionId), value(_value), gas(_gas), gasPrice(_gasPrice) {} @@ -124,7 +125,7 @@ class TransactionListModel: public QAbstractListModel Q_OBJECT Q_PROPERTY(int count READ getCount() NOTIFY countChanged()) -enum Roles + enum Roles { TitleRole = Qt::DisplayRole, IdRole = Qt::UserRole + 1 @@ -147,12 +148,14 @@ public: Q_INVOKABLE QList getFunctions(); /// @returns function parameters along with parameter values if set. @see TransactionParameterItem Q_INVOKABLE QVariantList getParameters(int _id, QString const& _functionId); + /// Launch transaction execution UI handler Q_INVOKABLE void runTransaction(int _index); signals: - void transactionAdded(); + /// Transaction count has changed void countChanged(); - void transactionRan(dev::mix::TransactionSettings); + /// Transaction has be launched + void transactionStarted(dev::mix::TransactionSettings); private: std::vector m_transactions; diff --git a/mix/TransactionListView.cpp b/mix/TransactionListView.cpp index c1ff88c4b..7e2bfaa25 100644 --- a/mix/TransactionListView.cpp +++ b/mix/TransactionListView.cpp @@ -1,18 +1,18 @@ /* - This file is part of cpp-ethereum. + This file is part of cpp-ethereum. - cpp-ethereum is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - cpp-ethereum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with cpp-ethereum. If not, see . + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . */ /** @file TransactionListView.cpp * @author Arkadiy Paronyan arkadiy@ethdev.com diff --git a/mix/TransactionListView.h b/mix/TransactionListView.h index 5124e6541..be1aef905 100644 --- a/mix/TransactionListView.h +++ b/mix/TransactionListView.h @@ -1,15 +1,15 @@ /* - This file is part of cpp-ethereum. - cpp-ethereum is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - cpp-ethereum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with cpp-ethereum. If not, see . + This file is part of cpp-ethereum. + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . */ /** @file TransactionListView.h * @author Arkadiy Paronyan arkadiy@ethdev.com @@ -42,13 +42,12 @@ public: void start() const override; QString title() const override; QString contentUrl() const override; + /// @returns the underlying model TransactionListModel* model() const { return m_model.get(); } private: QTextDocument* m_editor; std::unique_ptr m_model; - -public slots: }; }