- Coding standards

mix/AssemblyDebuggerModel.cpp

@@ -102,9 +102,9 @@ DebuggingContent AssemblyDebuggerModel::getContractInitiationDebugStates(dev::u2
 	return getContractInitiationDebugStates(bytesRef);
 }
 
-bool AssemblyDebuggerModel::compile(QString code)
+bool AssemblyDebuggerModel::compile(QString _code)
 {
 	ConstantCompilationModel compiler;
-	CompilerResult res = compiler.compile(code);
+	CompilerResult res = compiler.compile(_code);
 	return res.success;
 }

mix/AssemblyDebuggerModel.h

@@ -38,7 +38,7 @@ public:
 	AssemblyDebuggerModel();
 	DebuggingContent getContractInitiationDebugStates(dev::u256, dev::u256, dev::u256, QString, KeyPair);
 	DebuggingContent getContractInitiationDebugStates(dev::bytesConstRef);
-	bool compile(QString code);
+	bool compile(QString);
 
 private:
 	std::unique_ptr<dev::eth::Executive> m_currentExecution;

mix/CodeEditorExtensionManager.cpp

@@ -28,7 +28,6 @@
 #include <libevm/VM.h>
 #include "ConstantCompilationCtrl.h"
 #include "AssemblyDebuggerCtrl.h"
-#include "features.h"
 #include "ApplicationCtx.h"
 #include "CodeEditorExtensionManager.h"
 using namespace dev::mix;

mix/DebuggingStateWrapper.cpp

@@ -31,13 +31,13 @@ using namespace dev;
 using namespace dev::eth;
 using namespace dev::mix;
 
-std::tuple<QList<QObject*>, QQMLMap*> DebuggingStateWrapper::getHumanReadableCode(const bytes& code, QObject* _objUsedAsParent)
+std::tuple<QList<QObject*>, QQMLMap*> DebuggingStateWrapper::getHumanReadableCode(const bytes& _code, QObject* _objUsedAsParent)
 {
 	QList<QObject*> codeStr;
 	QMap<int, int> codeMapping;
-	for (unsigned i = 0; i <= code.size(); ++i)
+	for (unsigned i = 0; i <= _code.size(); ++i)
 	{
-		byte b = i < code.size() ? code[i] : 0;
+		byte b = i < _code.size() ? _code[i] : 0;
 		try
 		{
 			QString s = QString::fromStdString(instructionInfo((Instruction)b).name);
@@ -48,7 +48,7 @@ std::tuple<QList<QObject*>, QQMLMap*> DebuggingStateWrapper::getHumanReadableCod
 			if (b >= (byte)Instruction::PUSH1 && b <= (byte)Instruction::PUSH32)
 			{
 				unsigned bc = b - (byte)Instruction::PUSH1 + 1;
-				s = "PUSH 0x" + QString::fromStdString(toHex(bytesConstRef(&code[i + 1], bc)));
+				s = "PUSH 0x" + QString::fromStdString(toHex(bytesConstRef(&_code[i + 1], bc)));
 				i += bc;
 			}
 			HumanReadableCode* humanCode = new HumanReadableCode(QString::fromStdString(out.str()) + "  "  + s, line, _objUsedAsParent);

mix/MixApplication.cpp

@@ -23,7 +23,7 @@
 #include "MixApplication.h"
 using namespace dev::mix;
 
-MixApplication::MixApplication(int _argc, char *_argv[]): QApplication(_argc, _argv)
+MixApplication::MixApplication(int _argc, char* _argv[]): QApplication(_argc, _argv)
 {
 }