From aa5e44571b2119ac17932d3f76863a2dc07736ba Mon Sep 17 00:00:00 2001
From: "U-SVZ13\\Arkady" <arkady.paronyan@gmail.com>
Date: Tue, 23 Dec 2014 14:11:55 +0300
Subject: [PATCH] fixed compilation for msvc

---
 mix/AssemblyDebuggerControl.cpp | 6 +++++-
 mix/AssemblyDebuggerControl.h   | 4 ++++
 mix/AssemblyDebuggerModel.cpp   | 4 ++++
 mix/AssemblyDebuggerModel.h     | 4 ++++
 mix/DebuggingStateWrapper.h     | 1 +
 mix/KeyEventManager.h           | 1 +
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mix/AssemblyDebuggerControl.cpp b/mix/AssemblyDebuggerControl.cpp
index 8bc4831d0..fa76c8f5f 100644
--- a/mix/AssemblyDebuggerControl.cpp
+++ b/mix/AssemblyDebuggerControl.cpp
@@ -17,6 +17,10 @@
  * display opcode debugging.
  */
 
+//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
+//@todo fix this is solidity headers
+#include <libsolidity/Token.h>
+#include <libsolidity/Types.h>
 #include <QtConcurrent/QtConcurrent>
 #include <QDebug>
 #include <QVariableDefinition.h>
@@ -86,7 +90,7 @@ void AssemblyDebuggerControl::keyPressed(int _key)
 	}
 }
 
-void AssemblyDebuggerControl::callContract(TransactionSettings _tr, Address _contract)
+void AssemblyDebuggerControl::callContract(TransactionSettings _tr, dev::Address _contract)
 {
 	CompilerResult compilerRes = m_compilation->compile(m_doc->toPlainText());
 	if (!compilerRes.success)
diff --git a/mix/AssemblyDebuggerControl.h b/mix/AssemblyDebuggerControl.h
index 702839250..0103af3b1 100644
--- a/mix/AssemblyDebuggerControl.h
+++ b/mix/AssemblyDebuggerControl.h
@@ -19,6 +19,10 @@
 
 #pragma once
 
+//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
+//@todo fix this is solidity headers
+#include <libsolidity/Token.h>
+#include <libsolidity/Types.h>
 #include <QKeySequence>
 #include <QTextDocument>
 #include "Extension.h"
diff --git a/mix/AssemblyDebuggerModel.cpp b/mix/AssemblyDebuggerModel.cpp
index 1f260311a..21fa10873 100644
--- a/mix/AssemblyDebuggerModel.cpp
+++ b/mix/AssemblyDebuggerModel.cpp
@@ -17,6 +17,10 @@
  * used as a model to debug contract assembly code.
  */
 
+//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
+//@todo fix this is solidity headers
+#include <libsolidity/Token.h>
+#include <libsolidity/Types.h>
 #include <QApplication>
 #include <libdevcore/Common.h>
 #include <libevm/VM.h>
diff --git a/mix/AssemblyDebuggerModel.h b/mix/AssemblyDebuggerModel.h
index 1b1254464..9dbb58d78 100644
--- a/mix/AssemblyDebuggerModel.h
+++ b/mix/AssemblyDebuggerModel.h
@@ -19,6 +19,10 @@
 
 #pragma once
 
+//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
+//@todo fix this is solidity headers
+#include <libsolidity/Token.h>
+#include <libsolidity/Types.h>
 #include <QObject>
 #include <QList>
 #include <libdevcore/Common.h>
diff --git a/mix/DebuggingStateWrapper.h b/mix/DebuggingStateWrapper.h
index 219edfed3..bf3efe34d 100644
--- a/mix/DebuggingStateWrapper.h
+++ b/mix/DebuggingStateWrapper.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <QStringList>
+#include <QMap>
 #include <libdevcore/Common.h>
 #include <libethereum/State.h>
 #include <libethereum/Executive.h>
diff --git a/mix/KeyEventManager.h b/mix/KeyEventManager.h
index badc27216..2a743fa8f 100644
--- a/mix/KeyEventManager.h
+++ b/mix/KeyEventManager.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <QObject>
+#include <QVariant>
 
 class KeyEventManager: public QObject
 {