Merge branch 'ide_m25' of https://github.com/yann300/cpp-ethereum into

mix_editor

Conflicts:
	mix/AppContext.cpp
	mix/AppContext.h
	mix/AssemblyDebuggerControl.cpp

mix/AppContext.cpp

@@ -37,7 +37,6 @@
 
 using namespace dev;
 using namespace dev::eth;
-using namespace dev::solidity;
 using namespace dev::mix;
 
 const QString c_projectFileName = "project.mix";

mix/AppContext.h

@@ -32,17 +32,17 @@
 #include <QObject>
 
 class QQmlApplicationEngine;
-
 namespace dev
 {
-
+	class WebThreeDirect;
-class WebThreeDirect;
+	namespace solidity
-
+	{
-namespace eth
+		class CompilerStack;
-{
+	}
-	class Client;
 }
 
+namespace dev
+{
 namespace mix
 {
 
@@ -57,7 +57,8 @@ class AppContext : public QObject
 
 public:
 	AppContext(QQmlApplicationEngine* _engine);
-	~AppContext();
+	virtual ~AppContext();
+	/// Get the current QQMLApplicationEngine instance.
 	QQmlApplicationEngine* appEngine();
 	/// Get code model
 	CodeModel* codeModel() { return m_codeModel.get(); }
@@ -76,7 +77,7 @@ private:
 public slots:
 	/// Delete the current instance when application quit.
 	void quitApplication() {}
-
+	/// Write json to a settings file
 	void saveProject(QString const& _json);
 };
 

mix/AssemblyDebuggerControl.cpp

@@ -17,13 +17,6 @@
  * 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 <utility>
-#include <stdexcept>
-#include <boost/exception/diagnostic_information.hpp>
 #include <QtConcurrent/QtConcurrent>
 #include <QDebug>
 #include <QQmlContext>

mix/AssemblyDebuggerControl.h

@@ -19,10 +19,6 @@
 
 #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 "Extension.h"
 #include "AssemblyDebuggerModel.h"

mix/AssemblyDebuggerModel.cpp

@@ -17,10 +17,6 @@
  * 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>

mix/AssemblyDebuggerModel.h

@@ -19,10 +19,6 @@
 
 #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>

mix/QContractDefinition.cpp

@@ -20,6 +20,7 @@
  */
 
 #include <QObject>
+#include <libsolidity/CompilerStack.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>