4 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 74ee25a110..ec4485c130 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -51,7 +51,7 @@ namespace Internal {
 
 struct ImageViewerPrivate
 {
-    QList<int> context;
+    Core::Context context;
     QString displayName;
     ImageViewerFile *file;
     ImageView *imageView;
@@ -109,7 +109,7 @@ ImageViewer::~ImageViewer()
     delete d_ptr->toolbar;
 }
 
-QList<int> ImageViewer::context() const
+Core::Context ImageViewer::context() const
 {
     return d_ptr->context;
 }
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index cb68a67e5b..903a21170a 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -52,7 +52,7 @@ public:
     explicit ImageViewer(QWidget *parent = 0);
     ~ImageViewer();
 
-    QList<int> context() const;
+    Core::Context context() const;
     QWidget *widget();
 
     bool createNew(const QString &contents = QString());
diff --git a/src/plugins/imageviewer/imagevieweractionhandler.cpp b/src/plugins/imageviewer/imagevieweractionhandler.cpp
index 2aa15e4910..39c9f8a9be 100644
--- a/src/plugins/imageviewer/imagevieweractionhandler.cpp
+++ b/src/plugins/imageviewer/imagevieweractionhandler.cpp
@@ -57,7 +57,7 @@ struct ImageViewerActionHandlerPrivate
     QPointer<QAction> actionBackground;
     QPointer<QAction> actionOutline;
 
-    QList<int> context;
+    Core::Context context;
     QPointer<QSignalMapper> signalMapper;
 };
 
@@ -126,7 +126,7 @@ void ImageViewerActionHandler::createActions()
 }
 
 QAction *ImageViewerActionHandler::registerNewAction(int actionId, const QString &id,
-                           const QString &title, const QList<int> &context, const QKeySequence &key)
+                           const QString &title, const Core::Context &context, const QKeySequence &key)
 {
     Core::ActionManager *actionManager = Core::ICore::instance()->actionManager();
     Core::Command *command = 0;
diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h
index 417e8fb79c..603612ef5c 100644
--- a/src/plugins/imageviewer/imagevieweractionhandler.h
+++ b/src/plugins/imageviewer/imagevieweractionhandler.h
@@ -31,11 +31,15 @@
 #ifndef IMAGEVIEWERACTIONHANDLER_H
 #define IMAGEVIEWERACTIONHANDLER_H
 
-#include <QObject>
+#include "coreplugin/icontext.h"
+
+#include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 
-QT_FORWARD_DECLARE_CLASS(QAction)
-QT_FORWARD_DECLARE_CLASS(QKeySequence)
+QT_BEGIN_NAMESPACE
+class QAction;
+class QKeySequence;
+QT_END_NAMESPACE
 
 namespace ImageViewer {
 namespace Internal {
@@ -65,7 +69,7 @@ protected:
       \return Created and registered action, 0 if something goes wrong
      */
     QAction *registerNewAction(int actionId, const QString &id, const QString &title,
-                               const QList<int> &context, const QKeySequence &key);
+                               const Core::Context &context, const QKeySequence &key);
 
 private:
     QScopedPointer<struct ImageViewerActionHandlerPrivate> d_ptr;