Browse Source

fixed cppcheck warnings

cl-refactor
arkpar 10 years ago
parent
commit
37fa06106b
  1. 3
      mix/ClientModel.cpp
  2. 2
      mix/CodeHighlighter.cpp
  3. 8
      mix/CodeModel.cpp
  4. 2
      mix/ContractCallDataEncoder.cpp
  5. 4
      mix/MixClient.cpp
  6. 4
      mix/QVariableDefinition.h

3
mix/ClientModel.cpp

@ -216,7 +216,6 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
for (TransactionSettings const& transaction: _sequence)
{
ContractCallDataEncoder encoder;
QFunctionDefinition const* f = nullptr;
if (!transaction.stdContractUrl.isEmpty())
{
//std contract
@ -229,9 +228,9 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
{
//encode data
CompiledContract const& compilerRes = m_context->codeModel()->contract(transaction.contractId);
QFunctionDefinition const* f = nullptr;
bytes contractCode = compilerRes.bytes();
std::shared_ptr<QContractDefinition> contractDef = compilerRes.sharedContract();
f = nullptr;
if (transaction.functionId.isEmpty())
f = contractDef->constructor();
else

2
mix/CodeHighlighter.cpp

@ -119,7 +119,7 @@ void CodeHighlighter::processComments(std::string const& _source)
//add single line comment
int start = i;
i += 2;
while (_source[i] != '\n' && i < size)
while (i < size && _source[i] != '\n')
++i;
m_formats.push_back(FormatRange(CodeHighlighterSettings::Comment, start, i - start));
}

8
mix/CodeModel.cpp

@ -108,7 +108,7 @@ void CodeModel::reset(QVariantMap const& _documents)
Guard pl(x_pendingContracts);
m_pendingContracts.clear();
for (QVariantMap::const_iterator d = _documents.cbegin(); d != _documents.cend(); d++)
for (QVariantMap::const_iterator d = _documents.cbegin(); d != _documents.cend(); ++d)
m_pendingContracts[d.key()] = d.value().toString();
// launch the background thread
m_compiling = true;
@ -138,7 +138,7 @@ QVariantMap CodeModel::contracts() const
{
QVariantMap result;
Guard l(x_contractMap);
for (ContractMap::const_iterator c = m_contractMap.cbegin(); c != m_contractMap.cend(); c++)
for (ContractMap::const_iterator c = m_contractMap.cbegin(); c != m_contractMap.cend(); ++c)
result.insert(c.key(), QVariant::fromValue(c.value()));
return result;
}
@ -146,7 +146,7 @@ QVariantMap CodeModel::contracts() const
CompiledContract* CodeModel::contractByDocumentId(QString _documentId) const
{
Guard l(x_contractMap);
for (ContractMap::const_iterator c = m_contractMap.cbegin(); c != m_contractMap.cend(); c++)
for (ContractMap::const_iterator c = m_contractMap.cbegin(); c != m_contractMap.cend(); ++c)
if (c.value()->m_documentId == _documentId)
return c.value();
return nullptr;
@ -163,7 +163,7 @@ CompiledContract const& CodeModel::contract(QString _name) const
void CodeModel::releaseContracts()
{
for (ContractMap::iterator c = m_contractMap.begin(); c != m_contractMap.end(); c++)
for (ContractMap::iterator c = m_contractMap.begin(); c != m_contractMap.end(); ++c)
c.value()->deleteLater();
m_contractMap.clear();
}

2
mix/ContractCallDataEncoder.cpp

@ -56,7 +56,7 @@ QList<QVariableDefinition*> ContractCallDataEncoder::decode(QList<QVariableDecla
QList<QVariableDefinition*> r;
for (int k = 0; k <_returnParameters.length(); k++)
{
QVariableDeclaration* dec = (QVariableDeclaration*)_returnParameters.at(k);
QVariableDeclaration* dec = static_cast<QVariableDeclaration*>(_returnParameters.at(k));
QVariableDefinition* def = nullptr;
if (dec->type().contains("int"))
def = new QIntType(dec, QString());

4
mix/MixClient.cpp

@ -117,8 +117,8 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
unsigned dataIndex = 0;
auto onOp = [&](uint64_t steps, Instruction inst, dev::bigint newMemSize, dev::bigint gasCost, void* voidVM, void const* voidExt)
{
VM& vm = *(VM*)voidVM;
ExtVM const& ext = *(ExtVM const*)voidExt;
VM& vm = *static_cast<VM*>(voidVM);
ExtVM const& ext = *static_cast<ExtVM const*>(voidExt);
if (lastCode == nullptr || lastCode != &ext.code)
{
auto const& iter = codeIndexes.find(&ext.code);

4
mix/QVariableDefinition.h

@ -135,8 +135,8 @@ class QBoolType: public QVariableDefinition
Q_OBJECT
public:
QBoolType() {}
QBoolType(QVariableDeclaration* _def, QString _value): QVariableDefinition(_def, _value) {}
QBoolType(): m_boolValue(false) {}
QBoolType(QVariableDeclaration* _def, QString _value): QVariableDefinition(_def, _value), m_boolValue(false) {}
dev::bytes encodeValue() override;
void decodeValue(dev::bytes const& _rawValue) override;
/// @returns the boolean value for the current definition.

Loading…
Cancel
Save