- QQMLApplicationEngine and AppContext moved to Extension.h

mix/AssemblyDebuggerCtrl.cpp

@@ -32,8 +32,6 @@ using namespace dev::mix;
 
 AssemblyDebuggerCtrl::AssemblyDebuggerCtrl(QTextDocument* _doc): Extension(ExtensionDisplayBehavior::ModalDialog)
 {
-	m_ctx = AppContext::getInstance();
-	m_appEngine = m_ctx->appEngine();
 	qRegisterMetaType<AssemblyDebuggerData>();
 	qRegisterMetaType<DebuggingStatusResult>();
 	connect(this, SIGNAL(dataAvailable(bool, DebuggingStatusResult, QList<QObject*>, AssemblyDebuggerData)),

mix/AssemblyDebuggerCtrl.h

@@ -55,8 +55,6 @@ public:
 private:
 	std::unique_ptr<AssemblyDebuggerModel> m_modelDebugger;
 	QTextDocument* m_doc;
-	AppContext* m_ctx;
-	QQmlApplicationEngine* m_appEngine;
 
 public slots:
 	void keyPressed(int);

mix/DebuggingStateWrapper.cpp

@@ -14,7 +14,7 @@
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file DebuggingStateWrapper.h
+/** @file DebuggingStateWrapper.cpp
  * @author Yann yann@ethdev.com
  * @date 2014
  * Used to translate c++ type (u256, bytes, ...) into friendly value (to be used by QML).

mix/Extension.cpp

@@ -25,6 +25,23 @@
 using namespace dev;
 using namespace dev::mix;
 
+Extension::Extension()
+{
+	init();
+}
+
+Extension::Extension(ExtensionDisplayBehavior _displayBehavior)
+{
+	init();
+	m_displayBehavior = _displayBehavior;
+}
+
+void Extension::init()
+{
+	m_ctx = AppContext::getInstance();
+	m_appEngine = m_ctx->appEngine();
+}
+
 void Extension::addTabOn(QObject* _view)
 {
 	if (contentUrl() == "")

mix/Extension.h

@@ -21,6 +21,7 @@
 
 #include <QApplication>
 #include <QQmlComponent>
+#include "AppContext.h"
 
 namespace dev
 {
@@ -39,8 +40,8 @@ class Extension: public QObject
 	Q_OBJECT
 
 public:
-	Extension() {}
+	Extension();
-	Extension(ExtensionDisplayBehavior _displayBehavior) { m_displayBehavior = _displayBehavior; }
+	Extension(ExtensionDisplayBehavior _displayBehavior);
 	virtual QString contentUrl() const { return ""; }
 	virtual QString title() const { return ""; }
 	virtual void start() const {}
@@ -52,6 +53,11 @@ public:
 protected:
 	QObject* m_view;
 	ExtensionDisplayBehavior m_displayBehavior;
+	AppContext* m_ctx;
+	QQmlApplicationEngine* m_appEngine;
+
+private:
+	void init();
 };
 
 }