Browse Source

fixed style and build

cl-refactor
arkpar 10 years ago
parent
commit
4f52200c7e
  1. 2
      libweb3jsonrpc/WebThreeStubServerBase.h
  2. 1
      mix/ClientModel.cpp
  3. 10
      mix/CodeEditorExtensionManager.cpp
  4. 1
      mix/CodeEditorExtensionManager.h
  5. 4
      mix/ContractCallDataEncoder.cpp

2
libweb3jsonrpc/WebThreeStubServerBase.h

@ -121,7 +121,7 @@ public:
std::map<dev::Public, dev::Secret> const& ids() const { return m_ids; } std::map<dev::Public, dev::Secret> const& ids() const { return m_ids; }
protected: protected:
virtual bool authenticate(dev::TransactionSkeleton const& _t) const = 0; virtual bool authenticate(dev::TransactionSkeleton const& _t) const;
protected: protected:
virtual dev::eth::Interface* client() = 0; virtual dev::eth::Interface* client() = 0;

1
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) 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); m_client->transact(m_client->userAccount().secret(), _tr.value, _contract, _data, _tr.gas, _tr.gasPrice);
ExecutionResult r = m_client->lastExecutionResult(); ExecutionResult r = m_client->lastExecutionResult();
r.contractAddress = _contract; r.contractAddress = _contract;

10
mix/CodeEditorExtensionManager.cpp

@ -88,21 +88,15 @@ void CodeEditorExtensionManager::initExtension(std::shared_ptr<Extension> _ext)
m_features.append(_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() void CodeEditorExtensionManager::applyCodeHighlight()
{ {
// m_appContext->codeModel()->updateFormatting(m_doc); //TODO: reimplement
} }
void CodeEditorExtensionManager::setRightTabView(QQuickItem* _tabView) void CodeEditorExtensionManager::setRightTabView(QQuickItem* _tabView)
{ {
m_rightTabView = _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) void CodeEditorExtensionManager::setTabView(QQuickItem* _tabView)

1
mix/CodeEditorExtensionManager.h

@ -59,7 +59,6 @@ public:
void setRightTabView(QQuickItem*); void setRightTabView(QQuickItem*);
private slots: private slots:
void onCodeChange();
void applyCodeHighlight(); void applyCodeHighlight();
private: private:

4
mix/ContractCallDataEncoder.cpp

@ -40,8 +40,8 @@ bytes ContractCallDataEncoder::encodedData()
void ContractCallDataEncoder::encode(QFunctionDefinition const* _function) void ContractCallDataEncoder::encode(QFunctionDefinition const* _function)
{ {
bytes i = _function->hash().asBytes(); bytes hash = _function->hash().asBytes();
m_encodedData.insert(m_encodedData.end(), i.begin(), i.end()); m_encodedData.insert(m_encodedData.end(), hash.begin(), hash.end());
} }
void ContractCallDataEncoder::encode(QVariableDeclaration const* _dec, bool _value) void ContractCallDataEncoder::encode(QVariableDeclaration const* _dec, bool _value)

Loading…
Cancel
Save