From 4f52200c7e514b8022b823d3c45af91aa1ea06c5 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 12 Jan 2015 13:13:45 +0100 Subject: [PATCH] fixed style and build --- libweb3jsonrpc/WebThreeStubServerBase.h | 2 +- mix/ClientModel.cpp | 1 - mix/CodeEditorExtensionManager.cpp | 10 ++-------- mix/CodeEditorExtensionManager.h | 1 - mix/ContractCallDataEncoder.cpp | 4 ++-- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/libweb3jsonrpc/WebThreeStubServerBase.h b/libweb3jsonrpc/WebThreeStubServerBase.h index 451e2f9ee..168ab288a 100644 --- a/libweb3jsonrpc/WebThreeStubServerBase.h +++ b/libweb3jsonrpc/WebThreeStubServerBase.h @@ -121,7 +121,7 @@ public: std::map const& ids() const { return m_ids; } protected: - virtual bool authenticate(dev::TransactionSkeleton const& _t) const = 0; + virtual bool authenticate(dev::TransactionSkeleton const& _t) const; protected: virtual dev::eth::Interface* client() = 0; diff --git a/mix/ClientModel.cpp b/mix/ClientModel.cpp index 9a90d52e3..bcbed1fac 100644 --- a/mix/ClientModel.cpp +++ b/mix/ClientModel.cpp @@ -214,7 +214,6 @@ ExecutionResult ClientModel::deployContract(bytes const& _code) ExecutionResult ClientModel::callContract(Address const& _contract, bytes const& _data, TransactionSettings const& _tr) { - //bytes call(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice) override; m_client->transact(m_client->userAccount().secret(), _tr.value, _contract, _data, _tr.gas, _tr.gasPrice); ExecutionResult r = m_client->lastExecutionResult(); r.contractAddress = _contract; diff --git a/mix/CodeEditorExtensionManager.cpp b/mix/CodeEditorExtensionManager.cpp index f5ceb333e..a123c3b7a 100644 --- a/mix/CodeEditorExtensionManager.cpp +++ b/mix/CodeEditorExtensionManager.cpp @@ -88,21 +88,15 @@ void CodeEditorExtensionManager::initExtension(std::shared_ptr _ext) m_features.append(_ext); } -void CodeEditorExtensionManager::onCodeChange() -{ -// m_appContext->codeModel()->updateFormatting(m_doc); //update old formatting -// m_appContext->codeModel()->registerCodeChange(m_doc->toPlainText()); -} - void CodeEditorExtensionManager::applyCodeHighlight() { -// m_appContext->codeModel()->updateFormatting(m_doc); + //TODO: reimplement } void CodeEditorExtensionManager::setRightTabView(QQuickItem* _tabView) { m_rightTabView = _tabView; - initExtensions(); //TODO: this is not the right place for it + initExtensions(); //TODO: move this to a proper place } void CodeEditorExtensionManager::setTabView(QQuickItem* _tabView) diff --git a/mix/CodeEditorExtensionManager.h b/mix/CodeEditorExtensionManager.h index e910b62d3..2f2a315b9 100644 --- a/mix/CodeEditorExtensionManager.h +++ b/mix/CodeEditorExtensionManager.h @@ -59,7 +59,6 @@ public: void setRightTabView(QQuickItem*); private slots: - void onCodeChange(); void applyCodeHighlight(); private: diff --git a/mix/ContractCallDataEncoder.cpp b/mix/ContractCallDataEncoder.cpp index 0e628c3c0..7a38db22b 100644 --- a/mix/ContractCallDataEncoder.cpp +++ b/mix/ContractCallDataEncoder.cpp @@ -40,8 +40,8 @@ bytes ContractCallDataEncoder::encodedData() void ContractCallDataEncoder::encode(QFunctionDefinition const* _function) { - bytes i = _function->hash().asBytes(); - m_encodedData.insert(m_encodedData.end(), i.begin(), i.end()); + bytes hash = _function->hash().asBytes(); + m_encodedData.insert(m_encodedData.end(), hash.begin(), hash.end()); } void ContractCallDataEncoder::encode(QVariableDeclaration const* _dec, bool _value)