From 309593704dbe7e75943db4c2820df1108641530b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 31 May 2011 10:47:39 +0200
Subject: [PATCH] qmljsinspector: style

Change-Id: I4d776b9d0ce77a74d0347eb08c15026982ab8054
Reviewed-on: http://codereview.qt.nokia.com/258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 .../qmljsinspector/qmlinspectortoolbar.cpp       |  3 ++-
 src/plugins/qmljsinspector/qmlinspectortoolbar.h | 16 +++++++---------
 src/plugins/qmljsinspector/qmljsinspector.cpp    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
index 5bc1ce6b08e..eb53323a08b 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
@@ -177,8 +177,9 @@ void QmlInspectorToolBar::setShowAppOnTop(bool showAppOnTop)
     m_emitSignals = true;
 }
 
-void QmlInspectorToolBar::createActions(const Core::Context &context)
+void QmlInspectorToolBar::createActions()
 {
+    Core::Context context(Debugger::Constants::C_QMLDEBUGGER);
     Core::ICore *core = Core::ICore::instance();
     Core::ActionManager *am = core->actionManager();
 
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index d886aacc46b..da48a1b65f6 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -38,14 +38,12 @@
 #include <QtCore/QObject>
 #include <QtGui/QIcon>
 
-QT_FORWARD_DECLARE_CLASS(QAction)
-QT_FORWARD_DECLARE_CLASS(QActionGroup)
-QT_FORWARD_DECLARE_CLASS(QColor)
-QT_FORWARD_DECLARE_CLASS(QToolButton)
-
-namespace Core {
-class Context;
-}
+QT_BEGIN_NAMESPACE
+class QAction;
+class QActionGroup;
+class QColor;
+class QToolButton;
+QT_END_NAMESPACE
 
 namespace Utils {
 class StyledBar;
@@ -73,7 +71,7 @@ public:
     };
 
     explicit QmlInspectorToolBar(QObject *parent = 0);
-    void createActions(const Core::Context &context);
+    void createActions();
     QWidget *widget() const;
 
 public slots:
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index f6e7db1e8dc..4ec3dc37e5b 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -719,7 +719,7 @@ void InspectorUi::setupDockWidgets()
 {
     Debugger::DebuggerMainWindow *mw = Debugger::DebuggerPlugin::mainWindow();
 
-    m_toolBar->createActions(Core::Context(Debugger::Constants::C_QMLDEBUGGER));
+    m_toolBar->createActions();
     m_toolBar->setObjectName("QmlInspectorToolbar");
     mw->setToolBar(Debugger::QmlLanguage, m_toolBar->widget());